- up to 2.5

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

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 62ca273e1b4936e1ccceee95c3d3559a84c0c69f..ff295495ef8b456d82a1586e2b4b70a3c2975d89 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,28 +1,26 @@
 
 %bcond_without tests
 
-%define                _ver 2.0
-%define                _svnrel 150
 Summary:       AppArmor userlevel parser utility
-Summary(pl.UTF-8):   Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
+Summary(pl.UTF-8):     Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:          apparmor-parser
-Version:       %{_ver}.%{_svnrel}
-Release:       0.3
+Version:       2.5
+Release:       1
+Epoch:         1
 License:       GPL
 Group:         Applications/System
-Source0:       http://forge.novell.com/modules/xfcontent/private.php/apparmor/Development%20-%20October%20Snapshot/%{name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5: cbb25435e4353b10b5fdd96f80c854b9
+Source0:       http://kernel.org/pub/linux/security/apparmor/AppArmor-%{version}/AppArmor-%{version}.tgz
+# Source0-md5: 4a747d1a1f85cb272d55b52c7e8a4a02
 Source1:       %{name}.init
-Patch0:                %{name}-pld.patch
-Patch1:                %{name}-no-fdopendir.patch
-Patch2:                %{name}-avoid-pushpop.patch
-Patch3:                %{name}-init-args.patch
-URL:           http://forge.novell.com/modules/xfmod/project/?apparmor
+Patch0:                %{name}-make.patch
+URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: libcap-devel
-BuildRequires: perl-Test-Harness >= 2.64
+BuildRequires: perl-Test-Harness
+BuildRequires: perl-tools-devel
+BuildRequires: perl-tools-pod
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,21 +35,21 @@ Linuksa. Ten pakiet jest częścią zestawu narzędzi nazywanych
 SubDomain.
 
 %prep
-%setup -q -n %{name}-%{_ver}
+%setup -q -n AppArmor-%{version}
+cd parser
 %patch0 -p1
-%patch1 -p1
-%patch2 -p2
-%patch3 -p2
 
 %build
-%{__make} \
+%{__make} -C parser main \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CXX="%{__cxx}" \
+       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}
 
@@ -63,6 +61,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apparmor
 %{__make} -C po install \
        DESTDIR=$RPM_BUILD_ROOT \
        NAME=%{name}
+
+cd ..
 %find_lang %{name}
 
 %clean
@@ -78,7 +78,7 @@ 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