[packages/libapparmor] - rel 3; fix python2.7 bindings with newer swig
arekm
arekm at pld-linux.org
Thu Dec 15 15:52:44 CET 2016
commit ddb57df607ac1f1011cf236b92231e2cc60227e3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Dec 15 15:52:35 2016 +0100
- rel 3; fix python2.7 bindings with newer swig
libapparmor-import.patch | 25 +++++++++++++++++++++++++
libapparmor.spec | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/libapparmor.spec b/libapparmor.spec
index 4647b62..6252945 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -8,13 +8,14 @@ Summary: Library to provide key AppArmor symbols
Summary(pl.UTF-8): Biblioteka udostępniająca kluczowe symbole AppArmor
Name: libapparmor
Version: 2.10.1
-Release: 2
+Release: 3
Epoch: 1
License: LGPL v2.1
Group: Libraries
Source0: http://launchpad.net/apparmor/2.10/%{version}/+download/apparmor-%{version}.tar.gz
# Source0-md5: c9d82e04d699b0530b12dec15136027d
Patch0: %{name}-private.patch
+Patch1: %{name}-import.patch
URL: http://wiki.apparmor.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1.4
@@ -147,6 +148,7 @@ Dowiązania do AppArmor dla języka Ruby.
%prep
%setup -q -n apparmor-%{version}
%patch0 -p1
+%patch1 -p0
%build
cd libraries/libapparmor
@@ -229,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py_sitedir}/LibAppArmor
%attr(755,root,root) %{py_sitedir}/LibAppArmor/_LibAppArmor.so
%{py_sitedir}/LibAppArmor/__init__.py[co]
+%{py_sitedir}/LibAppArmor/LibAppArmor.py[co]
%{py_sitedir}/LibAppArmor-*.egg-info
%endif
diff --git a/libapparmor-import.patch b/libapparmor-import.patch
new file mode 100644
index 0000000..8a2dae7
--- /dev/null
+++ b/libapparmor-import.patch
@@ -0,0 +1,25 @@
+--- libraries/libapparmor/swig/python/Makefile.am 2014-01-06 22:08:55 +0000
++++ libraries/libapparmor/swig/python/Makefile.am 2016-11-14 22:10:35 +0000
+@@ -6,9 +6,8 @@
+
+ libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
+ $(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
+- mv LibAppArmor.py __init__.py
+
+-MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py
++MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.py
+
+ all-local: libapparmor_wrap.c setup.py
+ if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi
+
+=== added file 'libraries/libapparmor/swig/python/__init__.py'
+--- libraries/libapparmor/swig/python/__init__.py 1970-01-01 00:00:00 +0000
++++ libraries/libapparmor/swig/python/__init__.py 2016-11-14 22:10:35 +0000
+@@ -0,0 +1,6 @@
++import sys
++
++if sys.version_info[0] >= 3:
++ from LibAppArmor.LibAppArmor import *
++else:
++ from .LibAppArmor import *
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libapparmor.git/commitdiff/ddb57df607ac1f1011cf236b92231e2cc60227e3
More information about the pld-cvs-commit
mailing list