From 04c1d37c115332566f4b236d014ab45b3f182379 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 29 Mar 2007 15:09:32 +0000
Subject: [PATCH] - Start shipping the rest of the setools command line apps

---
 setools.spec | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/setools.spec b/setools.spec
index 7595636..a7770ad 100644
--- a/setools.spec
+++ b/setools.spec
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -101,14 +101,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 	
 make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR=%{_libdir} install
-rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
-rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
-rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon
-rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon
-rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/searchcon.1
-rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/indexcon.1
-rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1
-rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/libsefs/sqlite
 
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
@@ -138,6 +130,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/awish
 %{_bindir}/seaudit
 %{_bindir}/seaudit-report
+%{_bindir}/findcon
+%{_bindir}/replcon
+%{_bindir}/searchcon
+%{_bindir}/indexcon
 %{_sbindir}/seaudit
 %{_datadir}/applications/apol.desktop
 %{_datadir}/applications/seaudit.desktop
@@ -166,6 +162,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/sediffx.1.gz
 %{_mandir}/man8/seaudit.8.gz
 %{_mandir}/man8/seaudit-report.8.gz
+%{_mandir}/man1/searchcon.1
+%{_mandir}/man1/indexcon.1
+%{_mandir}/man1/replcon.1
+%{_mandir}/man1/findcon.1
 %attr(0644,root,root) /usr/share/pixmaps/seaudit.png
 %attr(0644,root,root) /usr/share/pixmaps/apol.png
 %attr(0644,root,root) /usr/share/pixmaps/sediffx.png
@@ -222,6 +222,9 @@ Headers, static libraries and API docs for SETools.
 %attr(755,root,root) %{_libdir}/libseaudit.so*
 
 %changelog
+* Tue Mar 29 2007 Dan Walsh <dwalsh@redhat.com> 3.1-4
+- Start shipping the rest of the setools command line apps
+
 * Tue Feb 20 2007 Dan Walsh <dwalsh@redhat.com> 3.1-3
 - Fix conflict with tcl/init.tcl