rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.226, 1.227 policycoreutils.spec, 1.308, 1.309

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1499

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Sep 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-4
- Remove recursive switch when using rpm


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 
 audit2allow/avc.py           |    2 
 newrole/newrole.c            |    1 
 po/ca.po                     |  317 ++++++++++++----------
 po/de.po                     |  272 +++++--------------
 po/el.po                     |    6 
 po/ms.po                     |  263 +++++++++++-------
 po/sk.po                     |  596 ++++++++++++++++++++++++-------------------
 po/sv.po                     |  279 ++++++++------------
 po/zh_TW.po                  |    4 
 restorecon/restorecon.8      |    7 
 restorecon/restorecon.c      |   20 -
 restorecond/restorecond.init |    6 
 scripts/chcat                |    2 
 scripts/fixfiles             |    8 
 scripts/genhomedircon        |    2 
 semanage/semanage            |    2 
 semanage/seobject.py         |    2 
 18 files changed, 910 insertions(+), 881 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- policycoreutils-rhat.patch	6 Sep 2006 14:54:32 -0000	1.226
+++ policycoreutils-rhat.patch	6 Sep 2006 15:54:53 -0000	1.227
@@ -4455,7 +4455,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.28/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-09-01 22:32:11.000000000 -0400
-+++ policycoreutils-1.30.28/scripts/fixfiles	2006-09-06 10:51:54.000000000 -0400
++++ policycoreutils-1.30.28/scripts/fixfiles	2006-09-06 11:53:37.000000000 -0400
 @@ -117,8 +117,8 @@
      exit $?
  fi
@@ -4463,7 +4463,7 @@
 -    for i in `echo $RPMFILES | sed 's/,/ /g'`; do
 -	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
 +    for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
-+	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i -R $* -f - 2>&1 >> $LOGFILE
++	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i $* -f - 2>&1 >> $LOGFILE
      done
      exit $?
  fi


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- policycoreutils.spec	6 Sep 2006 14:54:33 -0000	1.308
+++ policycoreutils.spec	6 Sep 2006 15:54:54 -0000	1.309
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.28
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Sep 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-4
+- Remove recursive switch when using rpm
+
 * Wed Sep 6 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-3
 - Fix fixfiles to handle multiple rpm and make -o work