packages: apparmor-parser/apparmor-parser-pld.patch, apparmor-parser/apparm...
arekm
arekm at pld-linux.org
Thu Apr 5 22:50:00 CEST 2012
Author: arekm Date: Thu Apr 5 20:50:00 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.7.2
---- Files affected:
packages/apparmor-parser:
apparmor-parser-pld.patch (1.6 -> 1.7) , apparmor-parser.spec (1.39 -> 1.40) , apparmor-parser-bzr.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/apparmor-parser/apparmor-parser-pld.patch
diff -u packages/apparmor-parser/apparmor-parser-pld.patch:1.6 packages/apparmor-parser/apparmor-parser-pld.patch:1.7
--- packages/apparmor-parser/apparmor-parser-pld.patch:1.6 Mon Dec 12 21:55:42 2011
+++ packages/apparmor-parser/apparmor-parser-pld.patch Thu Apr 5 22:49:54 2012
@@ -1,14 +1,6 @@
=== modified file 'parser/rc.apparmor.functions'
--- parser/rc.apparmor.functions 2011-06-01 14:52:35 +0000
+++ parser/rc.apparmor.functions 2011-07-14 06:56:45 +0000
-@@ -198,6 +198,7 @@
- aa_log_skipped_msg "$profile"
- logger -t "AppArmor(init)" -p daemon.warn "Skipping profile $profile"
- STATUS=2
-+ continue
- elif [ "$skip" -ne 0 ]; then
- continue
- fi
@@ -206,7 +207,7 @@
if force_complain "${profile}" ; then
COMPLAIN="-C"
================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.39 packages/apparmor-parser/apparmor-parser.spec:1.40
--- packages/apparmor-parser/apparmor-parser.spec:1.39 Tue Dec 13 10:24:36 2011
+++ packages/apparmor-parser/apparmor-parser.spec Thu Apr 5 22:49:54 2012
@@ -5,16 +5,15 @@
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: 5
+Version: 2.7.2
+Release: 1
Epoch: 1
License: GPL
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.7/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: 2863e85bdfdf9ee35b83db6721fed1f1
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
@@ -45,15 +44,14 @@
%prep
%setup -q -n apparmor-%{version}
%patch0 -p0
-%patch1 -p0
%build
-%{__make} -C parser main manpages \
+%{__make} -j1 -C parser \
CC="%{__cc}" \
CXX="%{__cxx}" \
CFLAGS="%{rpmcflags} %{rpmcppflags}"
-%{?with_tests:%{__make} -C parser tests}
+%{?with_tests:%{__make} -j1 -C parser tests}
%install
rm -rf $RPM_BUILD_ROOT
@@ -69,7 +67,7 @@
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}
@@ -105,6 +103,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2012/04/05 20:49:54 arekm
+- up to 2.7.2
+
Revision 1.39 2011/12/13 09:24:36 arekm
- release 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/apparmor-parser/apparmor-parser-pld.patch?r1=1.6&r2=1.7
http://cvs.pld-linux.org/packages/apparmor-parser/apparmor-parser.spec?r1=1.39&r2=1.40
More information about the pld-cvs-commit
mailing list