From 35eefc5861302957d8b137c53d3f80d90157252e Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 26 Oct 2006 20:56:02 +0000
Subject: [PATCH] - Build on rawhide

---
 setools-rhat.patch | 22 +++++++---------------
 setools.spec       |  4 ++--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/setools-rhat.patch b/setools-rhat.patch
index c2d905a..e8a53fe 100644
--- a/setools-rhat.patch
+++ b/setools-rhat.patch
@@ -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
diff --git a/setools.spec b/setools.spec
index 8c1c294..122be52 100644
--- a/setools.spec
+++ b/setools.spec
@@ -88,7 +88,7 @@ tools.
 autoconf
 %configure --disable-bwidget-check --disable-selinux-check 
 make clean
-make LIBDIR=%{_libdir} MAYBE_BWIDGET=packages all
+make LIBDIR=%{_libdir} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -100,7 +100,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
 mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 	
-make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR=%{_libdir} MAYBE_BWIDGET=packages BWIDGET_DESTDIR="${RPM_BUILD_ROOT}/usr/share/tcl8.4/" install
+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