[packages/libapparmor] - up to 2.9.0

arekm arekm at pld-linux.org
Wed Oct 29 22:42:46 CET 2014


commit 1787012fb362aee4f387ff6649e031fb04abc308
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 29 22:42:40 2014 +0100

    - up to 2.9.0

 libapparmor-python-exception.patch | 27 ---------------------------
 libapparmor.spec                   | 15 ++++-----------
 2 files changed, 4 insertions(+), 38 deletions(-)
---
diff --git a/libapparmor.spec b/libapparmor.spec
index 2f8dfb0..c89e5ca 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -2,14 +2,13 @@
 Summary:	Library to provide key AppArmor symbols
 Summary(pl.UTF-8):	Biblioteka udostępniająca kluczowe symbole AppArmor
 Name:		libapparmor
-Version:	2.8.3
-Release:	5
+Version:	2.9.0
+Release:	1
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5:	43586e5096606e857fef45c49553e468
-Patch0:		%{name}-python-exception.patch
+Source0:	http://launchpad.net/apparmor/2.9/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	daaeb859452f793abfdafd33f88d3e90
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.4
@@ -115,7 +114,6 @@ Dowiązania do AppArmor dla języka Ruby.
 
 %prep
 %setup -q -n apparmor-%{version}
-%patch0 -p0
 
 %build
 cd libraries/libapparmor
@@ -152,15 +150,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libapparmor.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libapparmor.so.1
-%attr(755,root,root) %{_libdir}/libimmunix.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libimmunix.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libapparmor.so
-%attr(755,root,root) %{_libdir}/libimmunix.so
 %{_libdir}/libapparmor.la
-%{_libdir}/libimmunix.la
 %{_includedir}/aalogparse
 %{_includedir}/sys/apparmor.h
 %{_pkgconfigdir}/libapparmor.pc
@@ -172,7 +166,6 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libapparmor.a
-%{_libdir}/libimmunix.a
 
 %files -n perl-apparmor
 %defattr(644,root,root,755)
diff --git a/libapparmor-python-exception.patch b/libapparmor-python-exception.patch
deleted file mode 100644
index ce23c4a..0000000
--- a/libapparmor-python-exception.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'libraries/libapparmor/swig/SWIG/libapparmor.i'
---- libraries/libapparmor/swig/SWIG/libapparmor.i	2014-01-06 22:08:55 +0000
-+++ libraries/libapparmor/swig/SWIG/libapparmor.i	2014-03-07 19:54:12 +0000
-@@ -9,6 +9,16 @@
- %include "typemaps.i"
- %include <aalogparse.h>
- 
-+#ifdef SWIGPYTHON
-+%exception {
-+  $action
-+  if (result < 0) {
-+    PyErr_SetFromErrno(PyExc_OSError);
-+    return NULL;
-+  }
-+}
-+#endif
-+
- /* swig doesn't like the macro magic we do in apparmor.h so the fn prototypes
-  * are manually inserted here
-  */
-@@ -37,3 +37,5 @@
- extern int aa_getcon(char **con, char **mode);
- extern int aa_getpeercon_raw(int fd, char *buffer, int *size);
- extern int aa_getpeercon(int fd, char **con);
-+
-+%exception;
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libapparmor.git/commitdiff/1787012fb362aee4f387ff6649e031fb04abc308



More information about the pld-cvs-commit mailing list