- updated gettext BR

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

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 8a7e28b5e936a5a2d459e1f76ec254de2968fa26..d48e9b378a58a7fb926d5c4c12b80eacfe0a99d6 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,28 +1,38 @@
-
-%bcond_without tests
-
+#
+# Conditional build:
+%bcond_without 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
-Release:       2
+Version:       2.9.0
+Release:       1
 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/2.9/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: daaeb859452f793abfdafd33f88d3e90
 Source1:       %{name}.init
-Patch0:                %{name}-bzr.patch
-Patch1:                %{name}-pld.patch
+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
+%if %{without dynamic}
+BuildRequires: libapparmor-static
+BuildRequires: libstdc++-static
+%endif
+BuildRequires: perl-tools-pod
+%if %{with tests}
+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,17 +48,22 @@ SubDomain.
 
 %prep
 %setup -q -n apparmor-%{version}
-# reenable when needed
-#%patch0 -p0
-%patch1 -p0
+%patch0 -p0
 
 %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
@@ -64,7 +79,7 @@ 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} -j1 -C po install \
        DESTDIR=$RPM_BUILD_ROOT \
        NAME=%{name}
 
@@ -92,4 +107,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/apparmor
 /subdomain
 /var/lib/apparmor
-%{_mandir}/man[578]/*.[578]*
+%{_mandir}/man5/apparmor.d.5*
+%{_mandir}/man5/subdomain.conf.5*
+%{_mandir}/man7/apparmor.7*
+%{_mandir}/man8/apparmor_parser.8*