commit setools for openSUSE:Factory
Hello community, here is the log from the commit of package setools for openSUSE:Factory checked in at Tue Mar 9 17:07:01 CET 2010. -------- --- setools/setools.changes 2009-09-05 10:52:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/setools/setools.changes 2010-02-25 16:47:47.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 25 15:46:44 UTC 2010 - prusnak@suse.cz + +- updated to 3.3.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- setools-3.3.5.tar.bz2 New: ---- setools-3.3.6.tar.bz2 setools-python.patch setools-qpol.patch setools-seaudit-headers.patch setools-setup_py-prefix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setools.spec ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package setools (Version 3.3.5) +# spec file for package setools (Version 3.3.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,10 +20,10 @@ %define dataversion 3.3 Name: setools -Version: 3.3.5 -Release: 3 +Version: 3.3.6 +Release: 1 Url: http://oss.tresys.com/projects/setools/ -License: GPL v2 only +License: GPLv2 Group: System/Base Summary: Policy analysis tools for SELinux Source: http://oss.tresys.com/projects/setools/chrome/site/dists/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -31,9 +31,13 @@ Source2: apol.desktop Source3: seaudit.desktop Source4: sediffx.desktop -Patch0: %{name}-%{version}-javacflags.patch -Patch1: %{name}-%{version}-nonvoid.patch -Patch2: %{name}-%{version}-strcmp.patch +Patch0: %{name}-3.3.5-javacflags.patch +Patch1: %{name}-3.3.5-nonvoid.patch +Patch2: %{name}-3.3.5-strcmp.patch +Patch3: %{name}-qpol.patch +Patch4: %{name}-python.patch +Patch5: %{name}-seaudit-headers.patch +Patch6: %{name}-setup_py-prefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake bison flex pkgconfig BuildRequires: gcc gcc-c++ glibc-devel libstdc++-devel @@ -41,7 +45,10 @@ BuildRequires: gtk2-devel libglade2-devel libxml2-devel sqlite3-devel BuildRequires: java-devel python-devel swig tcl-devel tk-devel BuildRequires: update-alternatives update-desktop-files -Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release} +Requires: setools-libs = %{version}-%{release} +Requires: setools-libs-tcl = %{version}-%{release} +Requires: setools-gui = %{version}-%{release} +Requires: setools-console = %{version}-%{release} %description SETools is a collection of graphical tools, command-line tools, and @@ -51,6 +58,7 @@ SETools. %package libs + License: LGPL v2 Summary: Policy analysis support libraries for SELinux Group: System Environment/Libraries @@ -67,7 +75,23 @@ libseaudit parse and filter SELinux audit messages in log files libsefs SELinux file contexts library +%package -n python-setools +License: LGPL v2 +Summary: Python bindings for SELinux policy analysis +Group: Development/Languages +Requires: python setools-libs = %{version} + +%description -n python-setools +SETools is a collection of graphical tools, command-line tools, and +libraries designed to facilitate SELinux policy analysis. + +This package includes Python bindings for the following libraries: + libapol policy analysis library + libpoldiff semantic policy difference library + libqpol library that abstracts policy internals + libseaudit parse and filter SELinux audit messages in log files + libsefs SELinux file contexts library %package java License: LGPL v2 @@ -127,7 +151,7 @@ %package console Summary: Policy analysis command-line tools for SELinux Group: System/Base -License: GPL v2 only +License: GPLv2 Requires: setools-libs = %{version} %description console @@ -143,7 +167,7 @@ sediff semantic policy difference tool %package gui -License: GPL v2 only +License: GPLv2 Summary: Policy analysis graphical tools for SELinux Group: System/Base Requires: tcl tk bwidget @@ -169,12 +193,16 @@ %patch0 %patch1 %patch2 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %configure \ --disable-bwidget-check \ --disable-selinux-check \ - --disable-swig-python \ + --enable-swig-python \ --enable-swig-java \ --enable-swig-tcl \ --with-java-prefix=%{java_home} \ @@ -213,6 +241,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/* chmod 0755 $RPM_BUILD_ROOT%{setoolsdir}/seaudit-report-service chmod 0644 $RPM_BUILD_ROOT%{tcllibdir}/*/pkgIndex.tcl +# workaround python bindings installer that install files in both locations - TODO: fix properly +if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then + mv $RPM_BUILD_ROOT%{python_sitelib}/setools/* $RPM_BUILD_ROOT%{python_sitearch}/setools/ +fi %clean rm -rf $RPM_BUILD_ROOT @@ -220,21 +252,24 @@ %files libs %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README +%{_libdir}/libqpol.so.* %{_libdir}/libapol.so.* %{_libdir}/libpoldiff.so.* -%{_libdir}/libqpol.so.* -%{_libdir}/libseaudit.so.* %{_libdir}/libsefs.so.* +%{_libdir}/libseaudit.so.* %dir %{setoolsdir} -# %files -n python-setools -# %defattr(-,root,root,-) -# %{py_sitedir}/* + +%files -n python-setools +%defattr(-,root,root,-) +%{python_sitearch}/setools*.egg-info +%dir %{python_sitearch}/setools +%{python_sitearch}/setools/* %files java %defattr(-,root,root,-) +%{_libdir}/libjqpol.so.* %{_libdir}/libjapol.so.* %{_libdir}/libjpoldiff.so.* -%{_libdir}/libjqpol.so.* %{_libdir}/libjseaudit.so.* %{_libdir}/libjsefs.so.* %{setoolsdir}/*.jar @@ -243,9 +278,9 @@ %files tcl %defattr(-,root,root,-) %dir %{tcllibdir} +%{tcllibdir}/qpol/ %{tcllibdir}/apol/ %{tcllibdir}/poldiff/ -%{tcllibdir}/qpol/ %{tcllibdir}/seaudit/ %{tcllibdir}/sefs/ @@ -253,22 +288,22 @@ %defattr(-,root,root,-) %{_libdir}/*.so %{_libdir}/pkgconfig/* +%{_includedir}/qpol/ %{_includedir}/apol/ %{_includedir}/poldiff/ -%{_includedir}/qpol/ %{_includedir}/seaudit/ %{_includedir}/sefs/ %files console %defattr(-,root,root,-) -%{_bindir}/findcon +%{_bindir}/seinfo +%{_bindir}/sesearch %{_bindir}/indexcon +%{_bindir}/findcon %{_bindir}/replcon -%{_bindir}/seaudit-report %{_bindir}/sechecker %{_bindir}/sediff -%{_bindir}/seinfo -%{_bindir}/sesearch +%{_bindir}/seaudit-report %{setoolsdir}/sechecker-profiles/ %{setoolsdir}/sechecker_help.txt %{setoolsdir}/seaudit-report-service @@ -285,19 +320,19 @@ %files gui %defattr(-,root,root,-) -%{_bindir}/apol %{_bindir}/seaudit %{_bindir}/sediffx +%{_bindir}/apol %dir %{tcllibdir} %{tcllibdir}/apol_tcl/ +%{setoolsdir}/sediff_help.txt %{setoolsdir}/apol_help.txt -%{setoolsdir}/apol_perm_mapping_* %{setoolsdir}/domaintrans_help.txt %{setoolsdir}/file_relabel_help.txt %{setoolsdir}/infoflow_help.txt -%{setoolsdir}/seaudit_help.txt -%{setoolsdir}/sediff_help.txt %{setoolsdir}/types_relation_help.txt +%{setoolsdir}/apol_perm_mapping_* +%{setoolsdir}/seaudit_help.txt %{setoolsdir}/*.glade %{setoolsdir}/*.png %{setoolsdir}/apol.gif ++++++ apol.desktop ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:50.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Name=SELinux Policy Analysis -GenericName=SELinux Policy Analysis Tool -Comment=This tool can examine, search, and relate policy components and policy rules +GenericName=SELinux Policy Analysis Tool +Comment=This tool can examine, search, and relate policy components and policy rules Icon=apol Exec=apol Type=Application ++++++ seaudit.desktop ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:50.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Name=SELinux Audit Log Analysis GenericName=SELinux Audit Log Analysis Tool -Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. +Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. Icon=seaudit Exec=seaudit Type=Application ++++++ setools-3.3.5-javacflags.patch ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:50.000000000 +0100 @@ -1,6 +1,8 @@ ---- libapol/swig/java/Makefile.am +Index: libapol/swig/java/Makefile.am +=================================================================== +--- libapol/swig/java/Makefile.am.orig +++ libapol/swig/java/Makefile.am -@@ -97,7 +97,7 @@ +@@ -97,7 +97,7 @@ classes = $(patsubst %.java, $(package_d # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -9,9 +11,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libapol/swig/java/Makefile.in +Index: libapol/swig/java/Makefile.in +=================================================================== +--- libapol/swig/java/Makefile.in.orig +++ libapol/swig/java/Makefile.in -@@ -643,7 +643,7 @@ +@@ -687,7 +687,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -20,9 +24,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libpoldiff/swig/java/Makefile.am +Index: libpoldiff/swig/java/Makefile.am +=================================================================== +--- libpoldiff/swig/java/Makefile.am.orig +++ libpoldiff/swig/java/Makefile.am -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ classes = $(patsubst %.java, $(package_d # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -31,9 +37,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libpoldiff/swig/java/Makefile.in +Index: libpoldiff/swig/java/Makefile.in +=================================================================== +--- libpoldiff/swig/java/Makefile.in.orig +++ libpoldiff/swig/java/Makefile.in -@@ -618,7 +618,7 @@ +@@ -662,7 +662,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -42,9 +50,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libqpol/swig/java/Makefile.am +Index: libqpol/swig/java/Makefile.am +=================================================================== +--- libqpol/swig/java/Makefile.am.orig +++ libqpol/swig/java/Makefile.am -@@ -77,7 +77,7 @@ +@@ -77,7 +77,7 @@ classes = $(patsubst %.java,$(package_di # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES)) @@ -53,9 +63,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libqpol/swig/java/Makefile.in +Index: libqpol/swig/java/Makefile.in +=================================================================== +--- libqpol/swig/java/Makefile.in.orig +++ libqpol/swig/java/Makefile.in -@@ -620,7 +620,7 @@ +@@ -664,7 +664,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES)) @@ -64,9 +76,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libseaudit/swig/java/Makefile.am +Index: libseaudit/swig/java/Makefile.am +=================================================================== +--- libseaudit/swig/java/Makefile.am.orig +++ libseaudit/swig/java/Makefile.am -@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@ classes = $(patsubst %.java, $(package_d # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -75,9 +89,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libseaudit/swig/java/Makefile.in +Index: libseaudit/swig/java/Makefile.in +=================================================================== +--- libseaudit/swig/java/Makefile.in.orig +++ libseaudit/swig/java/Makefile.in -@@ -615,7 +615,7 @@ +@@ -659,7 +659,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -86,9 +102,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libsefs/swig/java/Makefile.am +Index: libsefs/swig/java/Makefile.am +=================================================================== +--- libsefs/swig/java/Makefile.am.orig +++ libsefs/swig/java/Makefile.am -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ classes = $(patsubst %.java, $(package_d # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) @@ -97,9 +115,11 @@ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) ---- libsefs/swig/java/Makefile.in +Index: libsefs/swig/java/Makefile.in +=================================================================== +--- libsefs/swig/java/Makefile.in.orig +++ libsefs/swig/java/Makefile.in -@@ -610,7 +610,7 @@ +@@ -654,7 +654,7 @@ $(wrappedso_DATA): $(filter %.cc, $(BUIL # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) ++++++ setools-3.3.5-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:50.000000000 +0100 @@ -1,6 +1,8 @@ ---- libqpol/src/module_compiler.c +Index: libqpol/src/module_compiler.c +=================================================================== +--- libqpol/src/module_compiler.c.orig +++ libqpol/src/module_compiler.c -@@ -257,6 +257,7 @@ +@@ -257,6 +257,7 @@ role_datum_t *declare_role(void) assert(0); /* should never get here */ } } @@ -8,7 +10,7 @@ } type_datum_t *declare_type(unsigned char primary, unsigned char isattr) -@@ -324,6 +325,7 @@ +@@ -324,6 +325,7 @@ type_datum_t *declare_type(unsigned char assert(0); /* should never get here */ } } @@ -16,7 +18,7 @@ } user_datum_t *declare_user(void) -@@ -419,6 +421,7 @@ +@@ -419,6 +421,7 @@ user_datum_t *declare_user(void) assert(0); /* should never get here */ } } @@ -24,7 +26,7 @@ } /* Return a type_datum_t for the local avrule_decl with the given ID. -@@ -771,6 +774,7 @@ +@@ -771,6 +774,7 @@ int require_role(int pass) assert(0); /* should never get here */ } } @@ -32,7 +34,7 @@ } static int require_type_or_attribute(int pass, unsigned char isattr) -@@ -828,6 +832,7 @@ +@@ -828,6 +832,7 @@ static int require_type_or_attribute(int assert(0); /* should never get here */ } } @@ -40,7 +42,7 @@ } int require_type(int pass) -@@ -893,6 +898,7 @@ +@@ -893,6 +898,7 @@ int require_user(int pass) assert(0); /* should never get here */ } } @@ -48,7 +50,7 @@ } int require_bool(int pass) -@@ -946,6 +952,7 @@ +@@ -946,6 +952,7 @@ int require_bool(int pass) assert(0); /* should never get here */ } } @@ -56,7 +58,7 @@ } int require_sens(int pass) -@@ -1014,6 +1021,7 @@ +@@ -1014,6 +1021,7 @@ int require_sens(int pass) assert(0); /* should never get here */ } } @@ -64,7 +66,7 @@ } int require_cat(int pass) -@@ -1072,6 +1080,7 @@ +@@ -1072,6 +1080,7 @@ int require_cat(int pass) assert(0); /* should never get here */ } } @@ -72,9 +74,11 @@ } static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack) ---- libqpol/src/policy_define.c +Index: libqpol/src/policy_define.c +=================================================================== +--- libqpol/src/policy_define.c.orig +++ libqpol/src/policy_define.c -@@ -1407,6 +1407,7 @@ +@@ -1410,6 +1410,7 @@ int define_compute_type(int which) assert(0); /* should never get here */ } } ++++++ setools-3.3.5-strcmp.patch ++++++ --- /var/tmp/diff_new_pack.TxLUUc/_old 2010-03-09 17:06:51.000000000 +0100 +++ /var/tmp/diff_new_pack.TxLUUc/_new 2010-03-09 17:06:51.000000000 +0100 @@ -1,4 +1,6 @@ ---- sediff/result_item_render.c +Index: sediff/result_item_render.c +=================================================================== +--- sediff/result_item_render.c.orig +++ sediff/result_item_render.c @@ -27,6 +27,7 @@ #include "result_item_render.h" @@ -8,7 +10,7 @@ static const char *form_name_map[] = { "Added", "Added New Type", "Removed", "Removed Missing Type", "Modified" -@@ -139,7 +140,7 @@ +@@ -139,7 +140,7 @@ void result_item_print_string_inline(Gtk } case ' ': { ++++++ setools-3.3.5.tar.bz2 -> setools-3.3.6.tar.bz2 ++++++ ++++ 123501 lines of diff (skipped) ++++++ setools-python.patch ++++++ ++++ 2607 lines (skipped) ++++++ setools-qpol.patch ++++++ Index: setools-3.3.6/libqpol/include/qpol/Makefile.am =================================================================== --- setools-3.3.6.orig/libqpol/include/qpol/Makefile.am +++ setools-3.3.6/libqpol/include/qpol/Makefile.am @@ -17,7 +17,7 @@ qpol_HEADERS = \ netifcon_query.h \ nodecon_query.h \ permissive_query.h \ - polcap_query.h + polcap_query.h \ policy.h \ policy_extend.h \ portcon_query.h \ Index: setools-3.3.6/libseaudit/swig/python/Makefile.am =================================================================== --- setools-3.3.6.orig/libseaudit/swig/python/Makefile.am +++ setools-3.3.6/libseaudit/swig/python/Makefile.am @@ -10,7 +10,7 @@ BUILT_SOURCES = seaudit_wrap.c AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \ @QPOL_CFLAGS@ @APOL_CFLAGS@ -I$(top_builddir) -fpic \ - -I$(top_srcdir)/libseaudit/include -D__attribute__\(x\)='' + -I$(top_srcdir)/libseaudit/include AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@ \ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@ @SEAUDIT_LIB_FLAG@ @XML_LIBS@ DEPENDENCIES = $(top_builddir)/libqpol/src/libqpol.so \ ++++++ setools-seaudit-headers.patch ++++++ Index: setools-3.3.6/libseaudit/include/seaudit/avc_message.h =================================================================== --- setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h +++ setools-3.3.6/libseaudit/include/seaudit/avc_message.h @@ -104,7 +104,7 @@ extern "C" * @return Source target, or NULL upon error or if unknown. Do not * free() this string. */ - extern const char *seaudit_avc_message_get_source__mls_lvl(const seaudit_avc_message_t * avc); + extern const char *seaudit_avc_message_get_source_mls_lvl(const seaudit_avc_message_t * avc); /** * Return the source context's mls clearance of an avc message. @@ -114,7 +114,7 @@ extern "C" * @return Source target, or NULL upon error or if unknown. Do not * free() this string. */ - extern const char *seaudit_avc_message_get_source__mls_clr(const seaudit_avc_message_t * avc); + extern const char *seaudit_avc_message_get_source_mls_clr(const seaudit_avc_message_t * avc); /** * Return the target context's user of an avc message. Index: setools-3.3.6/seaudit/toplevel.h =================================================================== --- setools-3.3.6.orig/seaudit/toplevel.h +++ setools-3.3.6/seaudit/toplevel.h @@ -164,7 +164,7 @@ apol_vector_t *toplevel_get_log_types(to * @return Vector of sorted types, or NULL if no log is loaded. The * caller must call apol_vector_destroy() upon the return value. */ -apol_vector_t *toplevel_get_log_clr(toplevel_t * top); +apol_vector_t *toplevel_get_log_mls_lvl(toplevel_t * top); /** * Return a vector of strings corresponding to all mls @@ -176,7 +176,7 @@ apol_vector_t *toplevel_get_log_clr(topl * @return Vector of sorted types, or NULL if no log is loaded. The * caller must call apol_vector_destroy() upon the return value. */ -apol_vector_t *toplevel_get_log_clr(toplevel_t * top); +apol_vector_t *toplevel_get_log_mls_clr(toplevel_t * top); /** * Return a vector of strings corresponding to all object classes ++++++ setools-setup_py-prefix.patch ++++++ Index: setools-3.3.6/python/setools/Makefile.am =================================================================== --- setools-3.3.6.orig/python/setools/Makefile.am +++ setools-3.3.6/python/setools/Makefile.am @@ -25,10 +25,10 @@ python-build: sesearch.c seinfo.c LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build install-exec-hook: - $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` uninstall-hook: - $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py uninstall --prefix=usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` clean-local: $(PYTHON) setup.py clean -a Index: setools-3.3.6/python/setools/Makefile.in =================================================================== --- setools-3.3.6.orig/python/setools/Makefile.in +++ setools-3.3.6/python/setools/Makefile.in @@ -535,10 +535,10 @@ python-build: sesearch.c seinfo.c LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build install-exec-hook: - $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` uninstall-hook: - $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py uninstall --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` clean-local: $(PYTHON) setup.py clean -a ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de