- up to 2.6.1

Changed files:
    apparmor-parser-rc.patch -> 1.2
    apparmor-parser.spec -> 1.34

diff --git a/apparmor-parser-rc.patch b/apparmor-parser-rc.patch
deleted file mode 100644 (file)
index 866c98c..0000000
--- a/apparmor-parser-rc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- rc.apparmor.functions.org  2010-03-17 21:06:13.768595265 +0100
-+++ rc.apparmor.functions      2010-03-17 21:08:34.122087900 +0100
-@@ -173,7 +173,7 @@
-                       exit 1
-                       ;;
-       esac
--      aa_log_action_begin "$PARSER_MSG"
-+      aa_log_action_start "$PARSER_MSG"
-       # run the parser on all of the apparmor profiles
-       if [ ! -f "$PARSER" ]; then
-               aa_log_failure_msg "AppArmor parser not found"
-@@ -412,9 +412,9 @@
- 
-       retval=0
-       #the list of profiles isn't stable once we start adding or removing
--      #them so stor to tmp first
-+      #them so store to tmp first (in reverse order so hat profiles are removed first)
-       MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX)
--      sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST"
-+      sed -e "s/ (\(enforce\|complain\))$//" "$SFS_MOUNTPOINT/profiles" | sort -r > "$MODULE_PLIST"
-       cat "$MODULE_PLIST" | while read profile ; do
-               echo -n "$profile" > "$SFS_MOUNTPOINT/.remove"
-               rc=$?
-@@ -430,7 +430,7 @@
-       aa_log_daemon_msg "Unloading AppArmor profiles "
-       remove_profiles
-       rc=$?
--      log_end_msg $rc
-+      aa_log_end_msg $rc
-       return $rc
- }
\ No newline at end of file

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index 360b601233be7130f33270285ca8c393b910c915..dca2fcfde23c836644df3c27106aa7777f4f8967 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -4,16 +4,15 @@
 Summary:       AppArmor userlevel parser utility
 Summary(pl.UTF-8):     Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:          apparmor-parser
-Version:       2.6.0
+Version:       2.6.1
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Applications/System
 Source0:       http://launchpad.net/apparmor/2.6/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5: 3b4fb4186ac6440a03d8f2dcf188d4b4
+# Source0-md5: e2dabce946cb8258834f90f0a6c87726
 Source1:       %{name}.init
 Patch0:                %{name}-bzr.patch
-Patch1:                %{name}-rc.patch
 URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: bison
 BuildRequires: flex
@@ -40,8 +39,6 @@ SubDomain.
 %setup -q -n apparmor-%{version}
 # reenable when needed
 #%patch0 -p0
-cd parser
-%patch1 -p0
 
 %build
 %{__make} -C parser main manpages \