rpms/setools/devel setools-rhat.patch,1.16,1.17

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22649

Modified Files:
	setools-rhat.patch 
Log Message:
* Thu Nov 3 2005 Dan Walsh <dwalsh at redhat.com> 2.2
- Upgrade to upstream version


setools-rhat.patch:
 Makefile         |    3 ++-
 apol/Makefile    |    3 ++-
 seaudit/Makefile |    4 ++--
 sediff/Makefile  |    3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools-rhat.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- setools-rhat.patch	3 Nov 2005 21:51:53 -0000	1.16
+++ setools-rhat.patch	3 Nov 2005 22:16:53 -0000	1.17
@@ -1,5 +1,5 @@
 --- setools-2.2/seaudit/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/seaudit/Makefile	2005-11-03 16:46:34.000000000 -0500
++++ setools-2.2/seaudit/Makefile	2005-11-03 17:11:31.000000000 -0500
 @@ -60,8 +60,8 @@
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
  
@@ -12,7 +12,7 @@
  	install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
  	install -m 444 dot_seaudit $(INSTALL_LIBDIR)
 --- setools-2.2/apol/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/apol/Makefile	2005-11-03 16:46:34.000000000 -0500
++++ setools-2.2/apol/Makefile	2005-11-03 17:11:31.000000000 -0500
 @@ -80,7 +80,7 @@
  	$(MAKE) -C .. libsefs
  
@@ -30,8 +30,8 @@
  	cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping
  
  clean:
---- setools-2.2/Makefile.rhat	2005-11-03 16:46:34.000000000 -0500
-+++ setools-2.2/Makefile	2005-11-03 16:48:03.000000000 -0500
+--- setools-2.2/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
++++ setools-2.2/Makefile	2005-11-03 17:15:11.000000000 -0500
 @@ -10,7 +10,7 @@
  LIBS			= -lfl -lm
  
@@ -41,8 +41,16 @@
  STATIC_LIB_INSTALL_DIR 	= $(SHARED_LIB_INSTALL_DIR)
  SETOOLS_INCLUDE 	= $(INCLUDE_DIR)/setools
  TCLVER			= $(shell env tclsh tcl_vars)
+@@ -28,6 +28,7 @@
+ # Install directories
+ # Binaries go here
+ BINDIR			= $(DESTDIR)/usr/bin
++SBINDIR			= $(DESTDIR)/usr/sbin
+ # The code uses the specified path below. If you change this, DO NOT add 
+ # a trailing path seperator ("/"). For example, use "/usr/share/setools" 
+ # instead of "/usr/share/setools/". This probably needs to become more 
 --- setools-2.2/sediff/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/sediff/Makefile	2005-11-03 16:46:34.000000000 -0500
++++ setools-2.2/sediff/Makefile	2005-11-03 17:11:31.000000000 -0500
 @@ -24,7 +24,8 @@
  	install -m 755 sediff $(BINDIR);