rpms/setools/FC-6 setools-rhat.patch, 1.21, 1.22 setools.spec, 1.56, 1.57 sources, 1.18, 1.19

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Oct 30 20:35:35 UTC 2006 

Author: dwalsh

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

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


setools-rhat.patch:
 configure.ac |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-6/setools-rhat.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- setools-rhat.patch	21 Mar 2006 18:40:55 -0000	1.21
+++ setools-rhat.patch	30 Oct 2006 20:35:33 -0000	1.22
@@ -1,20 +1,61 @@
---- setools-2.3/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/Makefile	2006-01-31 16:18:43.000000000 -0500
-@@ -12,7 +12,7 @@
- PREFIX		?= $(DESTDIR)/usr
+--- setools-3.0/configure.ac.rhat	2006-10-13 14:59:34.000000000 -0400
++++ setools-3.0/configure.ac	2006-10-30 13:26:43.000000000 -0500
+@@ -19,7 +19,7 @@
  
- INCLUDE_DIR		= $(PREFIX)/include
--SHARED_LIB_INSTALL_DIR 	= $(PREFIX)/lib
-+SHARED_LIB_INSTALL_DIR 	= $(DESTDIR)$(LIBDIR)
- STATIC_LIB_INSTALL_DIR 	= $(SHARED_LIB_INSTALL_DIR)
- #SETOOLS_INCLUDE 	= $(INCLUDE_DIR)/setools-$(SETOOLS_VER)
- TCLVER			= $(shell env tclsh tcl_vars)
-@@ -37,7 +37,7 @@
- # instead of "/usr/share/setools/". This probably needs to become more 
- # robust in the future.
- #
--INSTALL_LIBDIR		= $(PREFIX)/share/setools-$(SETOOLS_VER)
-+INSTALL_LIBDIR		= $(PREFIX)/share/setools
- # all apps that have a te/fc file need to be listed here
- POLICYINSTALLDIRS 	= 
- # Help files here
+ libseaudit_version=3.0.0
+ 
+-setoolsdir='${prefix}/share/setools-3.0'
++setoolsdir='${prefix}/share/setools'
+ 
+ version_min_sepol_major=1
+ version_min_sepol_minor=12
+@@ -84,6 +84,7 @@
+     fi
+     AC_MSG_RESULT(disabled)
+ fi
++AC_SUBST(YFLAGS)
+ AC_SUBST(DEBUGCFLAGS)
+ AC_SUBST(DEBUGLDFLAGS)
+ QPOL_CFLAGS='-I$(top_srcdir)/libqpol/include'
+@@ -220,7 +221,10 @@
+         AC_SUBST(BWIDGET_DESTDIR)
+     fi
+ else
+-    copy_bwidget=no
++
++    BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/"
++    AC_SUBST(BWIDGET_DESTDIR)
++    copy_bwidget=yes
+     bwidget_ver=1.8
+ fi
+ 
+@@ -249,17 +253,21 @@
+ AC_ARG_WITH(sepol-devel,
+             AC_HELP_STRING([--with-sepol-devel],
+                            [prefix where sepol development files are installed]),
+-            sepol_devel="$withval",
+-            sepol_devel="/usr")
++	    sepol_devel_incdir="${withval}/include"
++	    sepol_devel_libdir="${withval}/lib"
++	    ,
++	    sepol_devel_incdir="/usr/include"
++	    sepol_devel_libdir="${libdir}"
++            )
+ AC_ARG_WITH(selinux-devel,
+             AC_HELP_STRING([--with-selinux-devel],
+                            [prefix where SELinux development files are installed]),
+-            selinux_devel="$withval",
+-            selinux_devel="/usr")
+-sepol_devel_incdir="${sepol_devel}/include"
+-sepol_devel_libdir="${sepol_devel}/lib"
+-selinux_devel_incdir="${selinux_devel}/include"
+-selinux_devel_libdir="${selinux_devel}/lib"
++	    selinux_devel_incdir="${withval}/include"
++	    selinux_devel_libdir="${withval}/lib"
++	    ,
++	    selinux_devel_incdir="/usr/include"
++	    selinux_devel_libdir="${libdir}"
++            )
+ AC_MSG_CHECKING([for sepol/sepol.h])
+ selinux_save_CFLAGS="${CFLAGS}"
+ SELINUX_LIB_FLAG="-L${sepol_devel_libdir} -L${selinux_devel_libdir}"


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-6/setools.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- setools.spec	12 Jul 2006 08:13:20 -0000	1.56
+++ setools.spec	30 Oct 2006 20:35:33 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
-Version: 2.4
-Release: 2.1
+Version: 3.0
+Release: 2.fc6
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -14,18 +14,18 @@
 Source10: seaudit.png
 Source11: apol.png
 Source12: sediffx.png
+Patch: setools-rhat.patch
 
 Prefix: %{_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: checkpolicy, policycoreutils, tcl >= 8.3
-Buildrequires: tk-devel >= 8.3, tcl-devel >= 8.3
+Requires: checkpolicy, policycoreutils, tcl >= 8.3 
+Buildrequires: tk-devel >= 8.3, tcl-devel >= 8.3 libsepol-devel >= 1.15.1
 BuildRequires: gtk2-devel, libglade2-devel
-BuildRequires: libselinux-devel, libxml2-devel
+BuildRequires: libselinux-devel, libxml2-devel 
+BuildRequires: autoconf
 BuildRequires: libcap-devel
 BuildPrereq: bison, flex, pkgconfig
 
-Patch0: setools-rhat.patch
-
 %description
 Security-enhanced Linux is a patch of the Linux kernel and a number of
 utilities with enhanced security functionality designed to add
@@ -82,11 +82,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .rhat
+%patch -p1 -b .rhat
 
 %build
+autoconf
+%configure --disable-bwidget-check --disable-selinux-check 
 make clean
-make INSTALL_HELPDIR=/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} all
+make LIBDIR=%{_libdir} all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -98,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}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget
+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
@@ -129,32 +131,21 @@
 
 %files gui
 %defattr(-,root,root)
-%dir /usr/share/tcl8.4/BWidget-1.7.0
-/usr/share/tcl8.4/BWidget-1.7.0/*
+%dir /usr/share/tcl8.4/BWidget-1.8.0
+/usr/share/tcl8.4/BWidget-1.8.0/*
 %{_bindir}/apol
 %{_bindir}/sediffx
 %{_bindir}/awish
 %{_bindir}/seaudit
+%{_bindir}/seaudit_report
 %{_sbindir}/seaudit
-%{_sbindir}/seaudit-report
 %{_datadir}/applications/apol.desktop
 %{_datadir}/applications/seaudit.desktop
 %{_datadir}/applications/sediffx.desktop
 %config(noreplace) %{_sysconfdir}/pam.d/seaudit
 %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-/usr/share/doc/setools-%{version}/apol*
-/usr/share/doc/setools-%{version}/seaudit_help.txt
-/usr/share/doc/setools-%{version}/types_relation_help.txt
-/usr/share/doc/setools-%{version}/dta_help.txt
-/usr/share/doc/setools-%{version}/file_relabel_help.txt
-/usr/share/doc/setools-%{version}/flow_assertion_help.txt
-/usr/share/doc/setools-%{version}/iflow_help.txt
-/usr/share/doc/setools-%{version}/obj_perms_help.txt
-/usr/share/doc/setools-%{version}/sechecker_help.txt
-/usr/share/doc/setools-%{version}/sediff_help.txt
 
 /usr/share/setools/apol.tcl
-/usr/share/setools/apol_perm_mapping
 /usr/share/setools/apol_perm_mapping_ver12
 /usr/share/setools/apol_perm_mapping_ver15
 /usr/share/setools/apol_perm_mapping_ver16
@@ -162,6 +153,7 @@
 /usr/share/setools/apol_perm_mapping_ver18
 /usr/share/setools/apol_perm_mapping_ver19
 /usr/share/setools/apol_perm_mapping_ver20
+/usr/share/setools/apol_perm_mapping_ver21
 /usr/share/setools/customize_filter_window.glade
 /usr/share/setools/dot_seaudit
 /usr/share/setools/filter_window.glade
@@ -192,13 +184,18 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/libapol
-%{_includedir}/libseaudit
+%{_includedir}/apol
+%{_includedir}/poldiff
+%{_includedir}/qpol
+%{_includedir}/sefs
 %{_includedir}/selinux/apol
-%{_includedir}/libsefs
+
 %{_libdir}/libsefs.a
 %{_libdir}/libapol.a
+%{_libdir}/libapol-tcl.a
+%{_libdir}/libqpol.a
 %{_libdir}/libseaudit.a
+%{_libdir}/libpoldiff.a
 
 %post devel -p /sbin/ldconfig
 
@@ -211,21 +208,31 @@
 %{_bindir}/sechecker
 %{_bindir}/sediff
 %dir /usr/share/doc/setools-%{version}
-/usr/share/doc/setools-%{version}/KNOWN-BUGS
-/usr/share/doc/setools-%{version}/README
+%doc KNOWN-BUGS
+%doc README
 %{_mandir}/man1/sechecker.1.gz
 %{_mandir}/man1/seinfo.1.gz
 %{_mandir}/man1/sediff.1.gz
 %{_mandir}/man1/sesearch.1.gz
 %attr(755,root,root) %dir /usr/share/setools
-%attr(755,root,root) %dir /usr/share/setools/sechecker
-%attr(755,root,root) %dir /usr/share/setools/sechecker/profiles
-/usr/share/setools/sechecker/profiles/*
+%attr(755,root,root) %dir /usr/share/setools/sechecker-profiles
+/usr/share/setools/sechecker-profiles/*
+/usr/share/setools/*.txt
 %{_libdir}/libapol.so*
-%{_libdir}/libseaudit.so*
+%{_libdir}/libqpol.so*
+%{_libdir}/libpoldiff.so*
 %{_libdir}/libsefs.so*
 
 %changelog
+* Mon Oct 30 2006 Dan Walsh <dwalsh at redhat.com> 3.0-2.fc6
+- bump for fc6
+ 
+* Thu Oct 26 2006 Dan Walsh <dwalsh at redhat.com> 3.0-2
+- Build on rawhide
+
+* Sun Oct 15 2006 Dan Walsh <dwalsh at redhat.com> 3.0-1
+- Update to upstream
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 May 2006 17:54:10 -0000	1.18
+++ sources	30 Oct 2006 20:35:33 -0000	1.19
@@ -1 +1 @@
-4b3d22e07fc92a5c1321bf08958dda81  setools-2.4.tar.bz2
+2148553aeba09ced4e850cd3777d42c0  setools-3.0.tar.bz2

More information about the fedora-cvs-commits mailing list