X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apparmor-parser.spec;h=3087cb695d52cd05b5ba8f92bf3c0903487c157f;hb=4694c997336dd9414e305168d3a7f94caee21659;hp=9ec50efdd43f985eb891aebdd42fdedf4362fdda;hpb=95aac2771bed1f057a1007dd40d3cfc1fc6e8cdf;p=packages%2Fapparmor-parser.git

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 9ec50ef..3087cb6 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,30 +1,32 @@
 
 %bcond_without	tests
 
-%define		_ver 2.1.2
-%define		_svnrel 1278
 Summary:	AppArmor userlevel parser utility
 Summary(pl.UTF-8):	Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:		apparmor-parser
-Version:	%{_ver}.%{_svnrel}
+Version:	2.7.2
 Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/System
-# Source0:	http://forge.novell.com/modules/xfcontent/private.php/apparmor/AppArmor-%{_ver}/%{name}-%{_ver}-%{_svnrel}.tar.gz
-Source0:	%{name}-%{_ver}-%{_svnrel}.tar.bz2
-# Source0-md5:	29c771617aa690b97f05618317281e64
+Source0:	http://launchpad.net/apparmor/2.7/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	2863e85bdfdf9ee35b83db6721fed1f1
 Source1:	%{name}.init
-Patch0:		%{name}-init-args.patch
-URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
+Patch0:		%{name}-pld.patch
+URL:		http://apparmor.wiki.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-BuildRequires:	latex2html
 BuildRequires:	libcap-devel
+BuildRequires:	libstdc++-devel
+# for apparmor_profile which links statically sometimes
+BuildRequires:	libstdc++-static
+BuildRequires:	perl-Test-Harness
 BuildRequires:	perl-tools-devel
 BuildRequires:	perl-tools-pod
-BuildRequires:	tetex-format-pdflatex
+%if %{with tests}
+BuildRequires:	perl-Locale-gettext
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,31 +41,36 @@ Linuksa. Ten pakiet jest częścią zestawu narzędzi nazywanych
 SubDomain.
 
 %prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p2
+%setup -q -n apparmor-%{version}
+%patch0 -p0
 
 %build
-%{__make} \
+%{__make} -j1 -C parser \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags} %{rpmcppflags}"
 
-%{?with_tests:%{__make} tests}
+%{?with_tests:%{__make} -j1 -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 \
+%{__make} -j1 -C po install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	NAME=%{name}
 
+cd ..
 %find_lang %{name}
 
 %clean
@@ -79,12 +86,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]*