X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apparmor-parser.spec;h=d48e9b378a58a7fb926d5c4c12b80eacfe0a99d6;hb=e2b8c2ab20917f75279a8e7da9ce5752a450612a;hp=bfe159d42c455615face21a6ab083fb8d95913b7;hpb=144822014e06ee8b847735396a88bf6b6ca8581b;p=packages%2Fapparmor-parser.git

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index bfe159d..d48e9b3 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -6,23 +6,27 @@
 Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
-Version:	2.8.3
+Version:	2.9.0
 Release:	1
 Epoch:		1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5:	43586e5096606e857fef45c49553e468
+Source0:	http://launchpad.net/apparmor/2.9/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	daaeb859452f793abfdafd33f88d3e90
 Source1:	%{name}.init
 Patch0:		%{name}-pld.patch
 URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	libapparmor-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libstdc++-devel
 # for apparmor_profile which links statically sometimes
-%{!?with_dynamic:BuildRequires:	libstdc++-static}
+%if %{without dynamic}
+BuildRequires:	libapparmor-static
+BuildRequires:	libstdc++-static
+%endif
 BuildRequires:	perl-tools-pod
 %if %{with tests}
 BuildRequires:	perl-Locale-gettext
@@ -51,12 +55,14 @@ SubDomain.
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
-	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=}
+	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS= AALIB=-lapparmor} \
+	USE_SYSTEM=1
 
 %if %{with tests}
 %{__make} -j1 -C parser tests \
 	CC="%{__cc}" \
-	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=-lstdc++}
+	%{?with_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS=-lstdc++ AALIB=-lapparmor} \
+	USE_SYSTEM=1
 %endif
 
 %install
@@ -102,7 +108,6 @@ fi
 /subdomain
 /var/lib/apparmor
 %{_mandir}/man5/apparmor.d.5*
-%{_mandir}/man5/apparmor.vim.5*
 %{_mandir}/man5/subdomain.conf.5*
 %{_mandir}/man7/apparmor.7*
 %{_mandir}/man8/apparmor_parser.8*