From c6fcc82665fd4fc3f827799cd9f776e98d6aae2e Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Sep 25 2006 14:01:37 +0000
Subject: * Tue Sep 21 2006 Dan Walsh <dwalsh@redhat.com> 1.30.29-5

- Remove recursion from fixfiles -R calls
- Fix semanage to verify prefix

---

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 2815af4..9ca167b 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -275,8 +275,8 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts
  
 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.29/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-09-14 08:07:24.000000000 -0400
-+++ policycoreutils-1.30.29/semanage/seobject.py	2006-09-22 11:24:59.000000000 -0400
-@@ -456,7 +456,9 @@
++++ policycoreutils-1.30.29/semanage/seobject.py	2006-09-25 09:53:57.000000000 -0400
+@@ -456,7 +456,8 @@
  				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
  				if rc < 0:
  					raise ValueError(_("Could not set MLS level for %s") % name)
@@ -286,7 +286,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanag
  			rc = semanage_user_set_prefix(self.sh, u, prefix)
  			if rc < 0:
  				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
-@@ -486,6 +488,7 @@
+@@ -486,6 +487,7 @@
  
  	def modify(self, name, roles = [], selevel = "", serange = "", prefix = ""):
  		oldroles = ""
@@ -294,7 +294,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanag
  		newroles = string.join(roles, ' ');
  		try:
  			if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
-@@ -521,7 +524,9 @@
+@@ -521,7 +523,9 @@
  				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
  
  			if prefix != "":
diff --git a/policycoreutils.spec b/policycoreutils.spec
index d32f204..1f6a4e9 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -81,7 +81,7 @@ rm -rf %{buildroot}
 %{_bindir}/semodule_deps
 %{_bindir}/semodule_expand
 %{_bindir}/semodule_link
-%{_ppbindir}/semodule_package
+%{_bindir}/semodule_package
 %{_mandir}/man8/chcat.8.gz
 %{_mandir}/man8/restorecond.8.gz
 %{_mandir}/man8/restorecon.8.gz