- updated gettext BR

[packages/apparmor-parser.git] / apparmor-parser.spec

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index ecc3f8b82d3b8d16be5015e4d4ec0b257667a88c..d48e9b378a58a7fb926d5c4c12b80eacfe0a99d6 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -6,24 +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.2
+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: bcc6bb56630b007d4ea5c9affe9d750d
+Source0:       http://launchpad.net/apparmor/2.9/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: daaeb859452f793abfdafd33f88d3e90
 Source1:       %{name}.init
 Patch0:                %{name}-pld.patch
-Patch1:                bison3.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
@@ -46,19 +49,20 @@ SubDomain.
 %prep
 %setup -q -n apparmor-%{version}
 %patch0 -p0
-%patch1 -p1
 
 %build
 %{__make} -j1 -C parser \
        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
@@ -104,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*