rpms/setools/devel setools-rhat.patch, 1.22, 1.23 setools.spec, 1.58, 1.59

Thu Oct 26 20:28:45 UTC 2006

Author: dwalsh

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

Modified Files:
	setools-rhat.patch setools.spec 
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 +++++++++++++++++++++----------
 packages/Makefile.am  |    2 +-
 seaudit/Makefile.am   |    4 +++-
 sechecker/Makefile.am |    2 +-
 sediff/Makefile.am    |    3 ++-
 7 files changed, 33 insertions(+), 17 deletions(-)

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

--- setools-rhat.patch	26 Oct 2006 19:38:13 -0000	1.22
+++ setools-rhat.patch	26 Oct 2006 20:28:43 -0000	1.23
@@ -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-24 13:14:16.000000000 -0400
++++ setools-3.0/Makefile.am	2006-10-26 16:08:20.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-24 13:14:16.000000000 -0400
++++ setools-3.0/sechecker/Makefile.am	2006-10-26 16:08:20.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-24 13:14:16.000000000 -0400
++++ setools-3.0/seaudit/Makefile.am	2006-10-26 16:08:20.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-24 13:14:16.000000000 -0400
++++ setools-3.0/apol/Makefile.am	2006-10-26 16:08:20.000000000 -0400
 @@ -4,9 +4,10 @@
  bin_PROGRAMS = apol
  dist_setools_SCRIPTS = apol.tcl
@@ -55,23 +55,16 @@
  	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-11 12:50:16.000000000 -0400
-+++ setools-3.0/packages/Makefile.am	2006-10-24 13:14:16.000000000 -0400
-@@ -1,10 +1,8 @@
+--- 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
  
- install-data-local:
- 	tar jxf BWidget-1.8.0.tar.bz2
--	mv BWidget-1.8.0 $(bwidget_destdir)
-+	mv BWidget-1.8.0 $(BWIDGET_DESTDIR)
- 
- uninstall-local:
--	-rm -rf $(bwidget_destdir)/BWidget-1.8.0
-+	-rm -rf $(BWIDGET_DESTDIR)/BWidget-1.8.0
 --- setools-3.0/sediff/Makefile.am.rhat	2006-10-04 12:14:48.000000000 -0400
-+++ setools-3.0/sediff/Makefile.am	2006-10-24 13:14:16.000000000 -0400
++++ setools-3.0/sediff/Makefile.am	2006-10-26 16:08:20.000000000 -0400
 @@ -1,6 +1,7 @@
  setoolsdir = @setoolsdir@
  
@@ -82,7 +75,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-24 13:18:31.000000000 -0400
++++ setools-3.0/configure.ac	2006-10-26 16:18:59.000000000 -0400
 @@ -3,6 +3,10 @@
  AC_CONFIG_HEADER(config.h)
  AM_INIT_AUTOMAKE(setools, 3.0)
@@ -103,7 +96,19 @@
  
  version_min_sepol_major=1
  version_min_sepol_minor=12
-@@ -249,17 +253,21 @@
+@@ -220,7 +224,10 @@
+         AC_SUBST(BWIDGET_DESTDIR)
+     fi
+ else
+-    copy_bwidget=no
++
++    BWIDGET_DESTDIR="\${datadir}/tcl8.4/"
++    AC_SUBST(BWIDGET_DESTDIR)
++    copy_bwidget=yes
+     bwidget_ver=1.8
+ fi
+ 
+@@ -249,17 +256,21 @@
  AC_ARG_WITH(sepol-devel,
              AC_HELP_STRING([--with-sepol-devel],
                             [prefix where sepol development files are installed]),


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- setools.spec	26 Oct 2006 19:39:04 -0000	1.58
+++ setools.spec	26 Oct 2006 20:28:43 -0000	1.59
@@ -88,7 +88,7 @@
 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/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


