From 4af2226534f12bbe23eb7b69e65b0156980fbda0 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: Wed, 27 Oct 2004 20:53:11 +0000
Subject: [PATCH] Adding patches for specfile

---
 libselinux.spec | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/libselinux.spec b/libselinux.spec
index 8eb2556..14a37c8 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,11 +1,18 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.17.15
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libselinux-%{version}.tgz
 #Patch: libselinux-rhat.patch
+Patch1: libselinux-1.17.14-man.patch
+Patch2: libselinux-1.17.14-getconlist.patch
+Patch3: libselinux-1.17.14-getenforce.patch
+Patch4: libselinux-1.17.14-getsebool.patch
+Patch5: libselinux-1.17.14-matchpathcon.patch
+Patch6: libselinux-1.17.14-setenforce.patch
+Patch7: libselinux-1.17.14-setsebool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -35,6 +42,13 @@ needed for developing SELinux applications.
 %prep
 %setup -q
 #%patch -p1 -b .rhat
+%patch1 -p1 -b .manpage
+%patch2 -p1 -b .conlist
+%patch3 -p1 -b .getenf
+%patch4 -p1 -b .getsebool
+%patch5 -p1 -b .matchpath
+%patch6 -p1 -b .setenforce
+%patch7 -p1 -b .setsebool
 
 %build
 make CFLAGS="-g %{optflags}"
@@ -47,6 +61,20 @@ mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install
 
+# Nuke the files we don't want to distribute
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/compute_*
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/deftype
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/execcon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/getcon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/getenforcemode
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/getfilecon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/getpidcon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mkdircon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/policyvers
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/setfilecon
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/selinuxconfig
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/selinuxdisable
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -69,6 +97,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Wed Oct 27 2004 Steve Grubb <sgrubb@redhat.com> 1.17.15-2
+- Remove test programs from package.
+- Update various utilities based on code reviews.
+
 * Fri Oct 15 2004 Dan Walsh <dwalsh@redhat.com> 1.17.15-1
 - Add -g flag to make
 - Upgrade to latest  from NSA