- rel 2; fix skipping unwanted profiles; allow to pass own options to parser

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

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 2679158ee9f8c3e73882c9ec971035608807ac16..8a7e28b5e936a5a2d459e1f76ec254de2968fa26 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,26 +1,27 @@
 
 %bcond_without tests
 
-%define                _ver 2.0.2
-%define                _svnrel 566
 Summary:       AppArmor userlevel parser utility
 Summary(pl.UTF-8):     Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:          apparmor-parser
-Version:       %{_ver}.%{_svnrel}
-Release:       0.3
+Version:       2.6.1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Applications/System
-Source0:       http://forge.novell.com/modules/xfcontent/private.php/apparmor/LKML_Submission-April_07/%{name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5: 9851ad9eec502a04b5d01998492e92f7
+Source0:       http://launchpad.net/apparmor/2.6/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: e2dabce946cb8258834f90f0a6c87726
 Source1:       %{name}.init
-Patch0:                %{name}-init-args.patch
-URL:           http://forge.novell.com/modules/xfmod/project/?apparmor
+Patch0:                %{name}-bzr.patch
+Patch1:                %{name}-pld.patch
+URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: libcap-devel
-BuildRequires: perl-Test-Harness >= 2.64
+BuildRequires: libstdc++-devel
+BuildRequires: perl-Test-Harness
+BuildRequires: perl-tools-devel
 BuildRequires: perl-tools-pod
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,30 +37,38 @@ Linuksa. Ten pakiet jest częścią zestawu narzędzi nazywanych
 SubDomain.
 
 %prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p2
+%setup -q -n apparmor-%{version}
+# reenable when needed
+#%patch0 -p0
+%patch1 -p0
 
 %build
-%{__make} \
+%{__make} -C parser main manpages \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags} %{rpmcppflags}"
 
-%{?with_tests:%{__make} tests}
+%{?with_tests:%{__make} -C parser tests}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd parser
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/apparmor}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,7,8},%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/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 \
        DESTDIR=$RPM_BUILD_ROOT \
        NAME=%{name}
+
+cd ..
 %find_lang %{name}
 
 %clean
@@ -75,12 +84,12 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
+%doc parser/README
 %attr(755,root,root) /sbin/apparmor_parser
 %dir %{_sysconfdir}/apparmor
 %{_sysconfdir}/apparmor/rc.apparmor.functions
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/subdomain.conf
 %attr(754,root,root) /etc/rc.d/init.d/apparmor
-#%attr(754,root,root) /etc/rc.d/init.d/aaeventd
 /subdomain
 /var/lib/apparmor
+%{_mandir}/man[578]/*.[578]*