X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=apparmor-parser.spec;h=af208a65547496352a586cb51a5e9c950f6a13de;hb=9c5ae45e2e627f6b35eee66200f868d96b671eb4;hp=bc12b03827cef8c5a5b58b5a3d2181b8f9da66ff;hpb=1c6f954a7f71a652386188e0dcebee1daca91f36;p=packages%2Fapparmor-parser.git

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index bc12b03..af208a6 100644
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,27 +1,38 @@
-
-%bcond_without	tests
-
-%define		_ver 2.0.2
-%define		_svnrel 757
+#
+# 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:	%{_ver}.%{_svnrel}
-Release:	0.3
+Version:	2.10
+Release:	1
 Epoch:		1
-License:	GPL
+License:	GPL v2
 Group:		Applications/System
-Source0:	http://forge.novell.com/modules/xfcontent/private.php/apparmor/LKML_Submission-June-07/%{name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5:	a53b5b577355c90b8e143fc932aedd59
+Source0:	http://launchpad.net/apparmor/2.10/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	9fd9b6b3525882fdb9441d0f0a8f9162
 Source1:	%{name}.init
-Patch0:		%{name}-init-args.patch
-URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
+Patch0:		%{name}-pld.patch
+URL:		http://wiki.apparmor.net/
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	libapparmor-devel >= 1:%{version}
 BuildRequires:	libcap-devel
-BuildRequires:	perl-Test-Harness >= 2.64
+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
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,30 +47,43 @@ 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_dynamic:AAREOBJECTS='$(AAREOBJECT)' AARE_LDFLAGS= AALIB=-lapparmor} \
+	USE_SYSTEM=1
 
-%{?with_tests:%{__make} 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
+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
@@ -75,12 +99,15 @@ 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}/man5/apparmor.d.5*
+%{_mandir}/man5/subdomain.conf.5*
+%{_mandir}/man7/apparmor.7*
+%{_mandir}/man8/apparmor_parser.8*