From 03f7110c613abbab9d419ad29ebee254a57884ad Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Sat, 14 Jan 2006 03:51:29 +0000
Subject: [PATCH] * Fri Jan 13 2006 Dan Walsh <dwalsh@redhat.com> 1.29.7-1 -
 Update to match NSA 	* Merged newrole cleanup patch from Steve Grubb. 
 * Merged setfiles/restorecon performance patch from Russell Coker. 	*
 Merged genhomedircon and semanage patches from Dan Walsh. 	* Merged
 remove add_local/set_local patch from Ivan Gyurdiev.

---
 .cvsignore           |  1 +
 policycoreutils.spec | 21 ++++++++++++++-------
 sources              |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ef9543e..4244cbd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -79,3 +79,4 @@ policycoreutils-1.29.2.tgz
 policycoreutils-1.29.3.tgz
 policycoreutils-1.29.4.tgz
 policycoreutils-1.29.5.tgz
+policycoreutils-1.29.7.tgz
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 25211d0..857b922 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,14 +1,14 @@
-%define libsepolver 1.11.5-1
-%define libsemanagever 1.5.8-1
-%define libselinuxver 1.29.3-2
+%define libsepolver 1.11.9-1
+%define libsemanagever 1.5.14-1
+%define libselinuxver 1.29.5-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.5
-Release: 3
+Version: 1.29.7
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Patch: policycoreutils-rhat.patch
+#Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} 
 PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -34,7 +34,7 @@ context.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
+#%patch -p1 -b .rhat
 
 %build
 make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -97,6 +97,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Fri Jan 13 2006 Dan Walsh <dwalsh@redhat.com> 1.29.7-1
+- Update to match NSA
+	* Merged newrole cleanup patch from Steve Grubb.
+	* Merged setfiles/restorecon performance patch from Russell Coker.
+	* Merged genhomedircon and semanage patches from Dan Walsh.
+	* Merged remove add_local/set_local patch from Ivan Gyurdiev.
+
 * Tue Jan 10 2006 Dan Walsh <dwalsh@redhat.com> 1.29.5-3
 - Fixes for mls policy
 
diff --git a/sources b/sources
index af83855..50af720 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da2c70fed32e21137b61f23da7a459f5  policycoreutils-1.29.5.tgz
+4bd38ec2ccaf8cc047dfdcb30876b9fb  policycoreutils-1.29.7.tgz