pool/setools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 126959 from home:coolo:branches:openSUSE:Factory

Browse Source 
- add setools-am121.patch to fix build with automake 1.12.1

OBS-URL: https://build.opensuse.org/request/show/126959
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/setools?expand=0&rev=33
This commit is contained in:
Ismail Dönmez 2012-07-03 09:35:39 +00:00 committed by Git OBS Bridge
parent 6f7d32f5f7
commit 6640ec73c7
3 changed files with 185 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
setools-am121.patch Normal file
View File

@ -0,0 +1,159 @@
Index: setools-3.3.6/apol/Makefile.am
===================================================================
--- setools-3.3.6.orig/apol/Makefile.am 2008-03-12 16:39:52.000000000 +0100
+++ setools-3.3.6/apol/Makefile.am 2012-07-03 11:11:01.642603291 +0200
@@ -86,7 +86,7 @@ $(wrappedso_DATA): apol_tcl.cc apol_tcl_
$(package_SCRIPTS): $(wrappedso_DATA) mkIndex.tcl
cat mkIndex.tcl | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libsefs/src $(TCLSH_PROG)
- $(mkdir_p) apol_tcl
+ $(MKDIR_P) apol_tcl
cp $< $@ apol_tcl
mkIndex.tcl: $(wrappedso_DATA) Makefile
Index: setools-3.3.6/libapol/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libapol/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libapol/swig/java/Makefile.am 2012-07-03 11:11:01.647603059 +0200
@@ -109,7 +109,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libapol/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libapol/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libapol/swig/tcl/Makefile.am 2012-07-03 11:11:01.649602966 +0200
@@ -28,7 +28,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) apol
+ $(MKDIR_P) apol
cp $(wrappedso_DATA) $@ apol
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) apol/$(wrappedso_DATA) apol/$(package_SCRIPTS)
Index: setools-3.3.6/libpoldiff/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libpoldiff/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libpoldiff/swig/java/Makefile.am 2012-07-03 11:11:01.653602780 +0200
@@ -84,7 +84,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libpoldiff/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libpoldiff/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libpoldiff/swig/tcl/Makefile.am 2012-07-03 11:11:01.655602687 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libpoldiff/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) poldiff
+ $(MKDIR_P) poldiff
cp $(wrappedso_DATA) $@ poldiff
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) poldiff/$(wrappedso_DATA) poldiff/$(package_SCRIPTS)
Index: setools-3.3.6/libqpol/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libqpol/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libqpol/swig/java/Makefile.am 2012-07-03 11:11:01.659602501 +0200
@@ -89,7 +89,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libqpol/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libqpol/swig/tcl/Makefile.am 2008-02-22 20:06:28.000000000 +0100
+++ setools-3.3.6/libqpol/swig/tcl/Makefile.am 2012-07-03 11:11:01.661602408 +0200
@@ -28,7 +28,7 @@ libdirs = $(top_builddir)/libqpol/src
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) qpol
+ $(MKDIR_P) qpol
cp $(wrappedso_DATA) $@ qpol
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) qpol/$(wrappedso_DATA) qpol/$(package_SCRIPTS)
Index: setools-3.3.6/libseaudit/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libseaudit/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libseaudit/swig/java/Makefile.am 2012-07-03 11:11:01.664602268 +0200
@@ -81,7 +81,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libseaudit/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libseaudit/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libseaudit/swig/tcl/Makefile.am 2012-07-03 11:11:01.666602175 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libseaudit/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) seaudit
+ $(MKDIR_P) seaudit
cp $(wrappedso_DATA) $@ seaudit
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) seaudit/$(wrappedso_DATA) seaudit/$(package_SCRIPTS)
Index: setools-3.3.6/libsefs/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libsefs/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libsefs/swig/java/Makefile.am 2012-07-03 11:11:01.850593620 +0200
@@ -76,7 +76,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libsefs/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libsefs/swig/tcl/Makefile.am 2008-02-22 20:06:28.000000000 +0100
+++ setools-3.3.6/libsefs/swig/tcl/Makefile.am 2012-07-03 11:11:01.873592549 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libsefs/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) sefs
+ $(MKDIR_P) sefs
cp $(wrappedso_DATA) $@ sefs
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) sefs/$(wrappedso_DATA) sefs/$(package_SCRIPTS)
Index: setools-3.3.6/packages/Makefile.am
===================================================================
--- setools-3.3.6.orig/packages/Makefile.am 2007-10-31 22:57:59.000000000 +0100
+++ setools-3.3.6/packages/Makefile.am 2012-07-03 11:11:01.954588782 +0200
@@ -20,9 +20,9 @@ $(pkgconfig_DATA): $(top_builddir)/confi
install-data-local:
if test $(copy_bwidget) = "yes"; then \
tar jxf BWidget-1.8.0.tar.bz2; \
- test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" ; \
+ test -z "$(bwidget_destdir)" || $(MKDIR_P) "$(bwidget_destdir)" ; \
cd BWidget-1.8.0 ; \
- find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; ; \
+ find . -type d -exec $(MKDIR_P) "$(bwidget_destdir)/{}" \; ; \
find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}' \; ; \
fi

5
setools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 3 09:13:03 UTC 2012 - coolo@suse.com
- add setools-am121.patch to fix build with automake 1.12.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 14 12:01:51 CEST 2012 - mls@suse.de Thu Jun 14 12:01:51 CEST 2012 - mls@suse.de

30
setools.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define dataversion 3.3 %define dataversion 3.3
Name: setools Name: setools
@ -38,6 +39,7 @@ Patch5: %{name}-seaudit-headers.patch
Patch6: %{name}-setup_py-prefix.patch Patch6: %{name}-setup_py-prefix.patch
Patch7: %{name}-swig-2x.patch Patch7: %{name}-swig-2x.patch
Patch8: %{name}-swig-2.0.7.patch Patch8: %{name}-swig-2.0.7.patch
Patch9: %{name}-am121.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -62,10 +64,10 @@ BuildRequires: tcl-devel
BuildRequires: tk-devel BuildRequires: tk-devel
BuildRequires: update-alternatives BuildRequires: update-alternatives
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: setools-console = %{version}-%{release}
Requires: setools-gui = %{version}-%{release}
Requires: setools-libs = %{version}-%{release} Requires: setools-libs = %{version}-%{release}
Requires: setools-libs-tcl = %{version}-%{release} Requires: setools-libs-tcl = %{version}-%{release}
Requires: setools-gui = %{version}-%{release}
Requires: setools-console = %{version}-%{release}
%description %description
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -96,7 +98,8 @@ This package includes the following run-time libraries:
Summary: Python bindings for SELinux policy analysis Summary: Python bindings for SELinux policy analysis
License: LGPL-2.0 License: LGPL-2.0
Group: Development/Languages Group: Development/Languages
Requires: python setools-libs = %{version} Requires: python
Requires: setools-libs = %{version}
%description -n python-setools %description -n python-setools
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -114,7 +117,8 @@ This package includes Python bindings for the following libraries:
Summary: Java bindings for SELinux policy analysis Summary: Java bindings for SELinux policy analysis
License: LGPL-2.0 License: LGPL-2.0
Group: Development/Languages Group: Development/Languages
Requires: java setools-libs = %{version} Requires: java
Requires: setools-libs = %{version}
%description java %description java
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -132,7 +136,8 @@ This package includes Java bindings for the following libraries:
Summary: Tcl bindings for SELinux policy analysis Summary: Tcl bindings for SELinux policy analysis
License: LGPL-2.0 License: LGPL-2.0
Group: Development/Languages Group: Development/Languages
Requires: tcl setools-libs = %{version} Requires: setools-libs = %{version}
Requires: tcl
%description tcl %description tcl
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -150,7 +155,9 @@ This package includes Tcl bindings for the following libraries:
Summary: Policy analysis development files for SELinux Summary: Policy analysis development files for SELinux
License: LGPL-2.0 License: LGPL-2.0
Group: Development/Libraries Group: Development/Libraries
Requires: libselinux-devel libsepol-devel setools-libs = %{version} Requires: libselinux-devel
Requires: libsepol-devel
Requires: setools-libs = %{version}
%description devel %description devel
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -187,9 +194,13 @@ This package includes the following console tools:
Summary: Policy analysis graphical tools for SELinux Summary: Policy analysis graphical tools for SELinux
License: GPL-2.0 License: GPL-2.0
Group: System/Base Group: System/Base
Requires: tcl tk bwidget Requires: bwidget
Requires: setools-libs = %{version} setools-tcl = %{version} Requires: glib2
Requires: glib2 gtk2 Requires: gtk2
Requires: setools-libs = %{version}
Requires: setools-tcl = %{version}
Requires: tcl
Requires: tk
# Requires: usermode # Requires: usermode
%description gui %description gui
@ -216,6 +227,7 @@ This package includes the following graphical tools:
%patch6 -p1 %patch6 -p1
%patch7 %patch7
%patch8 %patch8
%patch9 -p1
%build %build
autoreconf -fi autoreconf -fi