rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.96, 1.97 policycoreutils.spec, 1.129, 1.130

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Aug 22 2005 Dan Walsh <dwalsh at redhat.com> 1.25.5-3
- Fix fixfiles to call sort -u followed by sort -d.


policycoreutils-rhat.patch:
 fixfiles |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- policycoreutils-rhat.patch	17 Aug 2005 16:26:54 -0000	1.96
+++ policycoreutils-rhat.patch	22 Aug 2005 21:27:16 -0000	1.97
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.25.5/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2005-05-20 13:15:12.000000000 -0400
-+++ policycoreutils-1.25.5/scripts/fixfiles	2005-08-17 10:58:52.000000000 -0400
++++ policycoreutils-1.25.5/scripts/fixfiles	2005-08-22 17:25:15.000000000 -0400
 @@ -62,6 +62,7 @@
  	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
  	test -z "$TEMPFILE" && exit
@@ -9,7 +9,18 @@
  	sed -r -e 's,[[:blank:]].*,,g' \
                 -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \
  	       -e 's|([/[:alnum:]])\?|{\1,}|g' \
-@@ -80,7 +81,7 @@
+@@ -70,7 +71,9 @@
+ 	       -e 's|\[.*|*|g' \
+                -e 's|\.\*.*|*|g' \
+                -e 's|\.\+.*|*|g' | \
+-	sort -d -u | \
++	    # These two sorts need to be separate commands \
++	sort -u | \
++	sort -d | \
+         while read pattern ; \
+ 	    do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
+                   echo "$pattern"; \
+@@ -80,7 +83,7 @@
                 fi; \
              done | \
  	while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- policycoreutils.spec	17 Aug 2005 16:26:54 -0000	1.129
+++ policycoreutils.spec	22 Aug 2005 21:27:16 -0000	1.130
@@ -4,7 +4,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.25.5
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -89,6 +89,9 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Mon Aug 22 2005 Dan Walsh <dwalsh at redhat.com> 1.25.5-3
+- Fix fixfiles to call sort -u followed by sort -d.
+
 * Wed Aug 17 2005 Dan Walsh <dwalsh at redhat.com> 1.25.5-2
 - Change fixfiles to ignore /home directory on updates