X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=apparmor-parser.spec;h=aebf742979e01f7a729c5debe0c8abef70f9292e;hb=92aa3d0bc58676d5d89a006a96181eba83fa1669;hp=f574ecbd65f4c661c665e757ccad9a1b15f223d9;hpb=fb0645035095371ac86402a4c1ce4683dc4c8cc6;p=packages%2Fapparmor-parser.git

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index f574ecb..aebf742 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -6,19 +6,18 @@
 Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
-Version:	2.13.4
+Version:	3.0.7
 Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://launchpad.net/apparmor/2.13/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5:	a50b793a3362551f07733be3df9c328f
+Source0:	http://launchpad.net/apparmor/3.0/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	4cab0b7abb751439dec2d0e956732f08
 Source1:	%{name}.init
 Patch0:		%{name}-pld.patch
 # Drop when upstream does cache rebuild based on hash and not on mtime
 Patch1:		%{name}-cache-rebuild.patch
-Patch2:		apparmor-2.13.4-make4.3.patch
-Patch3:		apparmor-2.13.4-run_variable.patch
+Patch2:		cap.patch
 URL:		http://wiki.apparmor.net/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -56,10 +55,9 @@ SubDomain.
 
 %prep
 %setup -q -n apparmor-%{version}
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # avoid unnecessary rebuilding on install
 %{__sed} -i -e '/^\.PHONY: af_names.h/d' parser/Makefile
@@ -82,7 +80,7 @@ SubDomain.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/apparmor,/subdomain}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/apparmor,/var/cache/apparmor}
 
 %{__make} -C parser install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -112,16 +110,16 @@ fi
 %attr(755,root,root) %{_sbindir}/aa-teardown
 %dir %{_sysconfdir}/apparmor
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/parser.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/subdomain.conf
 %attr(754,root,root) /etc/rc.d/init.d/apparmor
 %{systemdunitdir}/apparmor.service
 %dir /lib/apparmor
+%attr(755,root,root) /lib/apparmor/profile-load
 /lib/apparmor/rc.apparmor.functions
 %attr(754,root,root) /lib/apparmor/apparmor.systemd
-%dir /subdomain
+%attr(700,root,root) %dir /var/cache/apparmor
 %dir /var/lib/apparmor
 %{_mandir}/man5/apparmor.d.5*
-%{_mandir}/man5/subdomain.conf.5*
 %{_mandir}/man7/apparmor.7*
+%{_mandir}/man7/apparmor_xattrs.7*
 %{_mandir}/man8/aa-teardown.8*
 %{_mandir}/man8/apparmor_parser.8*