From 146de046549df3949ba8472d3fa362d980dc3993 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 2 Aug 2005 16:57:45 +0000
Subject: [PATCH] * Thu Jul 28 2005 Dan Walsh <dwalsh@redhat.com> 1.25.4-1 -
 Update to match NSA 	* Changed semodule* to link with libsemanage.

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

diff --git a/.cvsignore b/.cvsignore
index 04fb726..71d5047 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -42,3 +42,4 @@ policycoreutils-1.24.tgz
 policycoreutils-1.25.1.tgz
 policycoreutils-1.25.2.tgz
 policycoreutils-1.25.3.tgz
+policycoreutils-1.25.4.tgz
diff --git a/policycoreutils.spec b/policycoreutils.spec
index fe688eb..a4dae26 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,8 +1,9 @@
 %define libselinuxver 1.23.1-1
 %define libsepolver 1.7-1
+%define libsemanagever 1.0-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.25.3
+Version: 1.25.4
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -10,7 +11,7 @@ Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Patch: policycoreutils-rhat.patch
 
 Prefix: %{_prefix}
-BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver}
+BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever}
 
 Requires: libselinux >= %{libselinuxver} libsepol >= %{libsepolver}
 
@@ -35,7 +36,7 @@ context.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
+
 %build
 make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
 
@@ -56,35 +57,41 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_sbindir}/setfiles
 /sbin/fixfiles
 /sbin/restorecon
-%{_mandir}/man8/restorecon.8.gz
+%{_sbindir}/setfiles
+%{_sbindir}/semodule
+%{_sbindir}/load_policy
+%{_sbindir}/audit2why
 %{_sbindir}/genhomedircon
 %{_sbindir}/sestatus
+%{_sbindir}/run_init
+%{_sbindir}/open_init_pty
+%{_bindir}/newrole
+%{_bindir}/audit2allow
+%{_bindir}/semodule_expand
+%{_bindir}/semodule_link
+%{_mandir}/man8/restorecon.8.gz
 %{_mandir}/man8/sestatus.8.gz
 %{_mandir}/man8/setfiles.8.gz
 %{_mandir}/man8/fixfiles.8.gz
 %{_mandir}/man8/load_policy.8.gz
-%{_mandir}/man1/audit2allow.1.gz
 %{_mandir}/man8/audit2why.8.gz
 %{_mandir}/man8/genhomedircon.8.gz
 %{_mandir}/man8/open_init_pty.8.gz
-
-%{_sbindir}/load_policy
-%{_bindir}/newrole
-%{_bindir}/audit2allow
-%{_sbindir}/audit2why
+%{_mandir}/man8/run_init.8.gz
+%{_mandir}/man1/audit2allow.1.gz
 %{_mandir}/man1/newrole.1.gz
 %config %{_sysconfdir}/pam.d/newrole
-%{_sbindir}/run_init
-%{_sbindir}/open_init_pty
 %config %{_sysconfdir}/pam.d/run_init
-%{_mandir}/man8/run_init.8.gz
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
-* Thu Jul 27 2005 Dan Walsh <dwalsh@redhat.com> 1.25.3-1
+* Thu Jul 28 2005 Dan Walsh <dwalsh@redhat.com> 1.25.4-1
+- Update to match NSA
+	* Changed semodule* to link with libsemanage.
+
+* Wed Jul 27 2005 Dan Walsh <dwalsh@redhat.com> 1.25.3-1
 - Update to match NSA
 	* Merged restorecon patch from Ivan Gyurdiev.
 
diff --git a/sources b/sources
index f764c33..84ce89e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea4ea978c040dc35db5b38ce28383bdc  policycoreutils-1.25.3.tgz
+545fa011e5422ac4f4a6e34fb4f94ecd  policycoreutils-1.25.4.tgz