X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=libapparmor.spec;h=d30fb73560bfea5f6c563ee7d0473d20c32b0ca3;hb=41c211a8c6cb852eba05bed5863d55867c2ab86c;hp=d2e3974de5487b2edaedcb793ddfff7ec50c5f4e;hpb=541a449753e5840f48bd658a4dc6ef2629ba085e;p=packages%2Flibapparmor.git

diff --git a/libapparmor.spec b/libapparmor.spec
index d2e3974..d30fb73 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -1,19 +1,17 @@
 #
 # Conditional build:
 %bcond_without	ruby		# build without Ruby bindings
-%bcond_with	python3		# build for Python3
 
-%include	/usr/lib/rpm/macros.perl
 Summary:	Library to provide key AppArmor symbols
 Summary(pl.UTF-8):	Biblioteka udostępniająca kluczowe symbole AppArmor
 Name:		libapparmor
-Version:	2.12
-Release:	1
+Version:	3.0.1
+Release:	2
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://launchpad.net/apparmor/2.12/%{version}.0/+download/apparmor-%{version}.tar.gz
-# Source0-md5:	49054f58042f8e51ea92cc866575a833
+Source0:	http://launchpad.net/apparmor/3.0/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	e05eab22bdd1dfc64854856a7292cf09
 Patch0:		%{name}-private.patch
 URL:		http://wiki.apparmor.net/
 BuildRequires:	autoconf >= 2.50
@@ -25,12 +23,8 @@ BuildRequires:	libtool
 BuildRequires:	perl-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
-%if %{with python3}
 BuildRequires:	python3-devel
-%else
-BuildRequires:	python-devel
-%endif
-BuildRequires:	rpmbuild(macros) >= 1.272
+BuildRequires:	rpmbuild(macros) >= 1.745
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 %{?with_ruby:BuildRequires:	ruby-devel}
@@ -95,24 +89,6 @@ Dowiązania do AppArmor dla Perla.
 %description -n perl-LibAppArmor -l pt_BR.UTF-8
 Módulos Perl para acessar os recursos do AppArmor.
 
-%package -n python-LibAppArmor
-Summary:	AppArmor Python bindings
-Summary(pl.UTF-8):	Dowiązania do AppArmor dla Pythona
-Summary(pt_BR.UTF-8):	Módulos Python para acessar os recursos do AppArmor
-Group:		Development/Languages/Python
-%pyrequires_eq  python
-Obsoletes:	python-apparmor
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description -n python-LibAppArmor
-AppArmor Python bindings.
-
-%description -n python-LibAppArmor -l pl.UTF-8
-Dowiązania do AppArmor dla Pythona.
-
-%description -n python-LibAppArmor -l pt_BR.UTF-8
-Módulos Python para acessar os recursos do AppArmor.
-
 %package -n python3-LibAppArmor
 Summary:	AppArmor Python bindings
 Summary(pl.UTF-8):	Dowiązania do AppArmor dla Pythona
@@ -157,9 +133,6 @@ cd libraries/libapparmor
 %{__automake}
 
 %configure \
-%if %{with python3}
-	PYTHON="%{__python3}" \
-%endif
 	%{?with_ruby:--with-ruby} \
 	--with-python \
 	--with-perl
@@ -217,23 +190,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorarch}/auto/LibAppArmor
 %attr(755,root,root) %{perl_vendorarch}/auto/LibAppArmor/LibAppArmor.so
 
-%if %{with python3}
 %files -n python3-LibAppArmor
 %defattr(644,root,root,755)
 %dir %{py3_sitedir}/LibAppArmor
 %attr(755,root,root) %{py3_sitedir}/LibAppArmor/_LibAppArmor.*.so
 %{py3_sitedir}/LibAppArmor/__pycache__
-%{py3_sitedir}/LibAppArmor/__init__.py
+%{py3_sitedir}/LibAppArmor/*.py
 %{py3_sitedir}/LibAppArmor-*.egg-info
-%else
-%files -n python-LibAppArmor
-%defattr(644,root,root,755)
-%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
 
 %if %{with ruby}
 %files -n ruby-LibAppArmor