rpms/setools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Build on rawhide

Browse Source
This commit is contained in:
Daniel J Walsh 2006-10-26 20:56:02 +00:00
parent 6c5a986741
commit 35eefc5861
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
setools-rhat.patch
View File

@ -1,5 +1,5 @@
--- setools-3.0/Makefile.am.rhat 2006-10-04 12:15:08.000000000 -0400 --- 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 @@ @@ -9,6 +9,7 @@
SUBDIRS = libqpol libapol libpoldiff libsefs libseaudit secmds sechecker sediff man $(MAYBE_GUI) $(MAYBE_BWIDGET) SUBDIRS = libqpol libapol libpoldiff libsefs libseaudit secmds sechecker sediff man $(MAYBE_GUI) $(MAYBE_BWIDGET)
@ -9,7 +9,7 @@
libqpol: libqpol:
$(MAKE) -C $(top_srcdir)/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.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 @@ @@ -1,7 +1,7 @@
setoolsdir = @setoolsdir@ setoolsdir = @setoolsdir@
bin_PROGRAMS = sechecker bin_PROGRAMS = sechecker
@ -20,7 +20,7 @@
profilesdir = @profile_install_dir@ 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.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 @@ @@ -10,6 +10,9 @@
@GTK_LIBS@ @GLADE_LIBS@ @XML_LIBS@ -rdynamic @GTK_LIBS@ @GLADE_LIBS@ @XML_LIBS@ -rdynamic
LDADD = @SELINUX_LIB_FLAG@ $(top_builddir)/libseaudit/libseaudit.a @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@ LDADD = @SELINUX_LIB_FLAG@ $(top_builddir)/libseaudit/libseaudit.a @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
@ -40,7 +40,7 @@
seaudit-report.css seaudit-report.css
--- setools-3.0/apol/Makefile.am.rhat 2006-10-13 13:56:21.000000000 -0400 --- 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 @@ @@ -4,9 +4,10 @@
bin_PROGRAMS = apol bin_PROGRAMS = apol
dist_setools_SCRIPTS = apol.tcl dist_setools_SCRIPTS = apol.tcl
@ -55,16 +55,8 @@
perm_maps/apol_perm_mapping_ver15 \ perm_maps/apol_perm_mapping_ver15 \
perm_maps/apol_perm_mapping_ver16 \ perm_maps/apol_perm_mapping_ver16 \
perm_maps/apol_perm_mapping_ver17 \ 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.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 @@ @@ -1,6 +1,7 @@
setoolsdir = @setoolsdir@ setoolsdir = @setoolsdir@
@ -75,7 +67,7 @@
if BUILD_GUI if BUILD_GUI
MAYBE_SEDIFFX = sediffx MAYBE_SEDIFFX = sediffx
--- setools-3.0/configure.ac.rhat 2006-10-13 14:59:34.000000000 -0400 --- 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 @@ @@ -3,6 +3,10 @@
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(setools, 3.0) AM_INIT_AUTOMAKE(setools, 3.0)
@ -102,7 +94,7 @@
else else
- copy_bwidget=no - copy_bwidget=no
+ +
+ BWIDGET_DESTDIR="\${datadir}/tcl8.4/" + BWIDGET_DESTDIR="\$(DESTDIR)/\${datadir}/tcl8.4/"
+ AC_SUBST(BWIDGET_DESTDIR) + AC_SUBST(BWIDGET_DESTDIR)
+ copy_bwidget=yes + copy_bwidget=yes
bwidget_ver=1.8 bwidget_ver=1.8

4
setools.spec
View File

@ -88,7 +88,7 @@ tools.
autoconf autoconf
%configure --disable-bwidget-check --disable-selinux-check %configure --disable-bwidget-check --disable-selinux-check
make clean make clean
make LIBDIR=%{_libdir} MAYBE_BWIDGET=packages all make LIBDIR=%{_libdir} all
%install %install
rm -rf ${RPM_BUILD_ROOT} 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/tcl8.4
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps 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/findcon
rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon