2001cdc
diff --git policycoreutils-2.8/newrole/newrole.1 policycoreutils-2.8/newrole/newrole.1
2001cdc
index 0d9738a..893c42f 100644
2001cdc
--- policycoreutils-2.8/newrole/newrole.1
2001cdc
+++ policycoreutils-2.8/newrole/newrole.1
2001cdc
@@ -44,7 +44,7 @@ specified by that range.  If the
2001cdc
 or
2001cdc
 .B --preserve-environment
2001cdc
 option is specified, the shell with the new SELinux context will preserve environment variables,
2001cdc
-otherwise a new minimal enviroment is created.
2001cdc
+otherwise a new minimal environment is created.
2001cdc
 .PP
2001cdc
 Additional arguments
2001cdc
 .I ARGS
0da684c
diff --git policycoreutils-2.8/po/Makefile policycoreutils-2.8/po/Makefile
0da684c
index 575e143..18bc1df 100644
0da684c
--- policycoreutils-2.8/po/Makefile
0da684c
+++ policycoreutils-2.8/po/Makefile
0da684c
@@ -3,7 +3,6 @@
0da684c
 #
0da684c
 
0da684c
 PREFIX ?= /usr
0da684c
-TOP	 = ../..
0da684c
 
0da684c
 # What is this package?
0da684c
 NLSPACKAGE	= policycoreutils
0da684c
@@ -32,74 +31,13 @@ USE_LINGUAS := $(if $(USER_LINGUAS),$(USER_LINGUAS),$(PO_LINGUAS))
0da684c
 
0da684c
 POFILES		= $(patsubst %,%.po,$(USE_LINGUAS))
0da684c
 MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
0da684c
-POTFILES = \
0da684c
-	../run_init/open_init_pty.c \
0da684c
-	../run_init/run_init.c \
0da684c
-	../semodule_link/semodule_link.c \
0da684c
-	../audit2allow/audit2allow \
0da684c
-	../semanage/seobject.py \
0da684c
-	../setsebool/setsebool.c \
0da684c
-	../newrole/newrole.c \
0da684c
-	../load_policy/load_policy.c \
0da684c
-	../sestatus/sestatus.c \
0da684c
-	../semodule/semodule.c \
0da684c
-	../setfiles/setfiles.c \
0da684c
-	../semodule_package/semodule_package.c \
0da684c
-	../semodule_deps/semodule_deps.c \
0da684c
-	../semodule_expand/semodule_expand.c \
0da684c
-	../scripts/chcat \
0da684c
-	../scripts/fixfiles \
0da684c
-	../restorecond/stringslist.c \
0da684c
-	../restorecond/restorecond.h \
0da684c
-	../restorecond/utmpwatcher.h \
0da684c
-	../restorecond/stringslist.h \
0da684c
-	../restorecond/restorecond.c \
0da684c
-	../restorecond/utmpwatcher.c \
0da684c
-	../gui/booleansPage.py \
0da684c
-	../gui/fcontextPage.py \
0da684c
-	../gui/loginsPage.py \
0da684c
-	../gui/mappingsPage.py \
0da684c
-	../gui/modulesPage.py \
0da684c
-	../gui/polgen.glade \
0da684c
-	../gui/polgengui.py \
0da684c
-	../gui/portsPage.py \
0da684c
-	../gui/semanagePage.py \
0da684c
-	../gui/statusPage.py \
0da684c
-	../gui/system-config-selinux.glade \
0da684c
-	../gui/system-config-selinux.py \
0da684c
-	../gui/usersPage.py \
0da684c
-	../secon/secon.c \
0da684c
-	booleans.py \
0da684c
-	../sepolicy/sepolicy.py \
0da684c
-	../sepolicy/sepolicy/communicate.py \
0da684c
-	../sepolicy/sepolicy/__init__.py \
0da684c
-	../sepolicy/sepolicy/network.py \
0da684c
-	../sepolicy/sepolicy/generate.py \
0da684c
-	../sepolicy/sepolicy/sepolicy.glade \
0da684c
-	../sepolicy/sepolicy/gui.py \
0da684c
-	../sepolicy/sepolicy/manpage.py \
0da684c
-	../sepolicy/sepolicy/transition.py \
0da684c
-	../sepolicy/sepolicy/templates/executable.py \
0da684c
-	../sepolicy/sepolicy/templates/__init__.py \
0da684c
-	../sepolicy/sepolicy/templates/network.py \
0da684c
-	../sepolicy/sepolicy/templates/rw.py \
0da684c
-	../sepolicy/sepolicy/templates/script.py \
0da684c
-	../sepolicy/sepolicy/templates/semodule.py \
0da684c
-	../sepolicy/sepolicy/templates/tmp.py \
0da684c
-	../sepolicy/sepolicy/templates/user.py \
0da684c
-	../sepolicy/sepolicy/templates/var_lib.py \
0da684c
-	../sepolicy/sepolicy/templates/var_log.py \
0da684c
-	../sepolicy/sepolicy/templates/var_run.py \
0da684c
-	../sepolicy/sepolicy/templates/var_spool.py
0da684c
+POTFILES  = $(shell cat POTFILES)
0da684c
 
0da684c
 #default:: clean
0da684c
 
0da684c
-all::  $(MOFILES)
0da684c
+all:: $(POTFILE) $(MOFILES)
0da684c
 
0da684c
-booleans.py:
0da684c
-	sepolicy booleans -a > booleans.py
0da684c
-
0da684c
-$(POTFILE): $(POTFILES) booleans.py
0da684c
+$(POTFILE): $(POTFILES)
0da684c
 	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
0da684c
 	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
0da684c
 	    rm -f $(NLSPACKAGE).po; \
0da684c
@@ -107,8 +45,6 @@ $(POTFILE): $(POTFILES) booleans.py
0da684c
 	    mv -f $(NLSPACKAGE).po $(POTFILE); \
0da684c
 	fi; \
0da684c
 
0da684c
-update-po: Makefile $(POTFILE) refresh-po
0da684c
-	@rm -f booleans.py
0da684c
 
0da684c
 refresh-po: Makefile
0da684c
 	for cat in $(POFILES); do \
0da684c
diff --git policycoreutils-2.8/po/POTFILES policycoreutils-2.8/po/POTFILES
0da684c
new file mode 100644
0da684c
index 0000000..12237dc
0da684c
--- /dev/null
0da684c
+++ policycoreutils-2.8/po/POTFILES
0da684c
@@ -0,0 +1,9 @@
0da684c
+../run_init/open_init_pty.c
0da684c
+../run_init/run_init.c
0da684c
+../setsebool/setsebool.c
0da684c
+../newrole/newrole.c
0da684c
+../load_policy/load_policy.c
0da684c
+../sestatus/sestatus.c
0da684c
+../semodule/semodule.c
0da684c
+../setfiles/setfiles.c
0da684c
+../secon/secon.c
e02a588
diff --git policycoreutils-2.8/scripts/fixfiles policycoreutils-2.8/scripts/fixfiles
e02a588
index b277958..53d28c7 100755
e02a588
--- policycoreutils-2.8/scripts/fixfiles
e02a588
+++ policycoreutils-2.8/scripts/fixfiles
0ea988e
@@ -108,6 +108,7 @@ exclude_dirs_from_relabelling() {
6d99bda
 fullFlag=0
6d99bda
 BOOTTIME=""
6d99bda
 VERBOSE="-p"
6d99bda
+[ -t 1 ] || VERBOSE=""
6d99bda
 FORCEFLAG=""
0ea988e
 RPMFILES=""
0ea988e
 PREFC=""
6456a75
diff --git policycoreutils-2.8/setfiles/setfiles.8 policycoreutils-2.8/setfiles/setfiles.8
6456a75
index ccaaf4d..a8a76c8 100644
6456a75
--- policycoreutils-2.8/setfiles/setfiles.8
6456a75
+++ policycoreutils-2.8/setfiles/setfiles.8
6456a75
@@ -57,7 +57,7 @@ check the validity of the contexts against the specified binary policy.
6456a75
 .TP
6456a75
 .B \-d
6456a75
 show what specification matched each file (do not abort validation
6456a75
-after ABORT_ON_ERRORS errors).
6456a75
+after ABORT_ON_ERRORS errors). Not affected by "\-q"
6456a75
 .TP
6456a75
 .BI \-e \ directory
6456a75
 directory to exclude (repeat option for more than one directory).