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

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 8a7e28b..aebf742 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,28 +1,45 @@
-
-%bcond_without	tests
-
+#
+# Conditional build:
+%bcond_with	tests	# don't perform "make tests"
+%bcond_with	dynamic	# link libstdc++ and libgcc dynamically
+#
 Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
-Version:	2.6.1
+Version:	3.0.7
 Release:	2
 Epoch:		1
-License:	GPL
+License:	GPL v2
 Group:		Applications/System
-Source0:	http://launchpad.net/apparmor/2.6/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5:	e2dabce946cb8258834f90f0a6c87726
+Source0:	http://launchpad.net/apparmor/3.0/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	4cab0b7abb751439dec2d0e956732f08
 Source1:	%{name}.init
-Patch0:		%{name}-bzr.patch
-Patch1:		%{name}-pld.patch
-URL:		http://apparmor.wiki.kernel.org/
+Patch0:		%{name}-pld.patch
+# Drop when upstream does cache rebuild based on hash and not on mtime
+Patch1:		%{name}-cache-rebuild.patch
+Patch2:		cap.patch
+URL:		http://wiki.apparmor.net/
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	libapparmor-devel >= 1:%{version}
 BuildRequires:	libcap-devel
 BuildRequires:	libstdc++-devel
+# for apparmor_profile which links statically sometimes
+%if %{without dynamic}
+BuildRequires:	libapparmor-static
+BuildRequires:	libstdc++-static
+%endif
+BuildRequires:	perl-tools-pod
+%if %{with tests}
+%if %(test -e /sys/kernel/security/apparmor/features ; echo $?)
+# apparmor enabled kernel running and fs mounted
+BuildRequires:	/sys/kernel/security/apparmor/features
+%endif
+BuildRequires:	perl-Locale-gettext
 BuildRequires:	perl-Test-Harness
 BuildRequires:	perl-tools-devel
-BuildRequires:	perl-tools-pod
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,37 +55,41 @@ SubDomain.
 
 %prep
 %setup -q -n apparmor-%{version}
-# reenable when needed
-#%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+# avoid unnecessary rebuilding on install
+%{__sed} -i -e '/^\.PHONY: af_names.h/d' parser/Makefile
+%{__sed} -i -e '/^\.\(PHONY\|SILENT\): \$(AAREOBJECT)/d' parser/Makefile
 
 %build
-%{__make} -C parser main manpages \
+%{__make} -j1 -C parser \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	CFLAGS="%{rpmcflags} %{rpmcppflags}"
+	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS= AALIB=-lapparmor} \
+	USE_SYSTEM=1
 
-%{?with_tests:%{__make} -C parser tests}
+%if %{with tests}
+%{__make} -j1 -C parser tests \
+	CC="%{__cc}" \
+	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=-lstdc++ AALIB=-lapparmor} \
+	USE_SYSTEM=1
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd parser
-
-install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,7,8},%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/apparmor}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/apparmor,/var/cache/apparmor}
 
-install apparmor_parser $RPM_BUILD_ROOT/sbin
-install subdomain.conf $RPM_BUILD_ROOT%{_sysconfdir}/apparmor
-install rc.apparmor.functions $RPM_BUILD_ROOT%{_sysconfdir}/apparmor
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apparmor
-install *.5 $RPM_BUILD_ROOT%{_mandir}/man5
-install *.7 $RPM_BUILD_ROOT%{_mandir}/man7
-install *.8 $RPM_BUILD_ROOT%{_mandir}/man8
-
-%{__make} -C po install \
+%{__make} -C parser install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	NAME=%{name}
+	DISTRO=systemd \
+	SYSTEMD_UNIT_DIR=$RPM_BUILD_ROOT%{systemdunitdir} \
+	USE_SYSTEM=1
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apparmor
 
-cd ..
 %find_lang %{name}
 
 %clean
@@ -86,10 +107,19 @@ fi
 %defattr(644,root,root,755)
 %doc parser/README
 %attr(755,root,root) /sbin/apparmor_parser
+%attr(755,root,root) %{_sbindir}/aa-teardown
 %dir %{_sysconfdir}/apparmor
-%{_sysconfdir}/apparmor/rc.apparmor.functions
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/subdomain.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/parser.conf
 %attr(754,root,root) /etc/rc.d/init.d/apparmor
-/subdomain
-/var/lib/apparmor
-%{_mandir}/man[578]/*.[578]*
+%{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
+%attr(700,root,root) %dir /var/cache/apparmor
+%dir /var/lib/apparmor
+%{_mandir}/man5/apparmor.d.5*
+%{_mandir}/man7/apparmor.7*
+%{_mandir}/man7/apparmor_xattrs.7*
+%{_mandir}/man8/aa-teardown.8*
+%{_mandir}/man8/apparmor_parser.8*