rpms/setools/devel setools-rhat.patch,1.23,1.24

Thu Oct 26 20:56:04 UTC 2006

Author: dwalsh

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

Modified Files:
	setools-rhat.patch 
Log Message:
* Thu Oct 26 2006 Dan Walsh <dwalsh at redhat.com> 3.0-2
- Build on rawhide


setools-rhat.patch:
 Makefile.am           |    1 +
 apol/Makefile.am      |    7 ++++---
 configure.ac          |   31 +++++++++++++++++++++----------
 seaudit/Makefile.am   |    4 +++-
 sechecker/Makefile.am |    2 +-
 sediff/Makefile.am    |    3 ++-
 6 files changed, 32 insertions(+), 16 deletions(-)

Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools-rhat.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24

--- setools-rhat.patch	26 Oct 2006 20:28:43 -0000	1.23
+++ setools-rhat.patch	26 Oct 2006 20:56:02 -0000	1.24
@@ -1,5 +1,5 @@
 --- setools-3.0/Makefile.am.rhat	2006-10-04 12:15:08.000000000 -0400
-+++ setools-3.0/Makefile.am	2006-10-26 16:08:20.000000000 -0400
++++ setools-3.0/Makefile.am	2006-10-26 16:20:34.000000000 -0400
 @@ -9,6 +9,7 @@
  SUBDIRS = libqpol libapol libpoldiff libsefs libseaudit secmds sechecker sediff man $(MAYBE_GUI) $(MAYBE_BWIDGET)
  
@@ -9,7 +9,7 @@
  libqpol:
  	$(MAKE) -C $(top_srcdir)/libqpol
 --- setools-3.0/sechecker/Makefile.am.rhat	2006-10-04 12:14:44.000000000 -0400
-+++ setools-3.0/sechecker/Makefile.am	2006-10-26 16:08:20.000000000 -0400
++++ setools-3.0/sechecker/Makefile.am	2006-10-26 16:20:34.000000000 -0400
 @@ -1,7 +1,7 @@
  setoolsdir = @setoolsdir@
  bin_PROGRAMS = sechecker
@@ -20,7 +20,7 @@
  
  profilesdir = @profile_install_dir@
 --- setools-3.0/seaudit/Makefile.am.rhat	2006-10-06 15:14:34.000000000 -0400
-+++ setools-3.0/seaudit/Makefile.am	2006-10-26 16:08:20.000000000 -0400
++++ setools-3.0/seaudit/Makefile.am	2006-10-26 16:20:34.000000000 -0400
 @@ -10,6 +10,9 @@
  	@GTK_LIBS@ @GLADE_LIBS@ @XML_LIBS@ -rdynamic
  LDADD = @SELINUX_LIB_FLAG@ $(top_builddir)/libseaudit/libseaudit.a @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
@@ -40,7 +40,7 @@
  	seaudit-report.css
  
 --- setools-3.0/apol/Makefile.am.rhat	2006-10-13 13:56:21.000000000 -0400
-+++ setools-3.0/apol/Makefile.am	2006-10-26 16:08:20.000000000 -0400
++++ setools-3.0/apol/Makefile.am	2006-10-26 16:20:34.000000000 -0400
 @@ -4,9 +4,10 @@
  bin_PROGRAMS = apol
  dist_setools_SCRIPTS = apol.tcl
@@ -55,16 +55,8 @@
  	perm_maps/apol_perm_mapping_ver15 \
  	perm_maps/apol_perm_mapping_ver16 \
  	perm_maps/apol_perm_mapping_ver17 \
---- setools-3.0/packages/Makefile.am.rhat	2006-10-26 16:15:12.000000000 -0400
-+++ setools-3.0/packages/Makefile.am	2006-10-26 16:19:41.000000000 -0400
-@@ -1,4 +1,4 @@
--bwidget_destdir = @BWIDGET_DESTDIR@
-+bwidget_destdir = $(DESTDIR)/@BWIDGET_DESTDIR@
- 
- dist_noinst_DATA = BWidget-1.8.0.tar.bz2 combobox.tcl mainframe.tcl notebook.tcl Doxyfile
- 
 --- setools-3.0/sediff/Makefile.am.rhat	2006-10-04 12:14:48.000000000 -0400
-+++ setools-3.0/sediff/Makefile.am	2006-10-26 16:08:20.000000000 -0400
++++ setools-3.0/sediff/Makefile.am	2006-10-26 16:20:34.000000000 -0400
 @@ -1,6 +1,7 @@
  setoolsdir = @setoolsdir@
  
@@ -75,7 +67,7 @@
  if BUILD_GUI
    MAYBE_SEDIFFX = sediffx
 --- setools-3.0/configure.ac.rhat	2006-10-13 14:59:34.000000000 -0400
-+++ setools-3.0/configure.ac	2006-10-26 16:18:59.000000000 -0400
++++ setools-3.0/configure.ac	2006-10-26 16:42:08.000000000 -0400
 @@ -3,6 +3,10 @@
  AC_CONFIG_HEADER(config.h)
  AM_INIT_AUTOMAKE(setools, 3.0)
@@ -102,7 +94,7 @@
  else
 -    copy_bwidget=no
 +
-+    BWIDGET_DESTDIR="\${datadir}/tcl8.4/"
++    BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/"
 +    AC_SUBST(BWIDGET_DESTDIR)
 +    copy_bwidget=yes
      bwidget_ver=1.8


