Accepting request 59064 from security:apparmor:factory

Accepted submit request 59064 from user jeff_mahoney

OBS-URL: https://build.opensuse.org/request/show/59064
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=5

apparmor.spec

@@ -32,6 +32,9 @@
 %define JAR_FILE changeHatValve.jar
 %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
 
+%define srcversion 2.5.1
+%define bzr_commit r1445
+
 Name:           apparmor
 %if ! %{?distro:1}0
 %if %{?suse_version:1}0
@@ -45,14 +48,14 @@ Name:           apparmor
   %define distro suse
 %endif
 Summary:        AppArmor userlevel parser utility
-Version:        2.5.1
-Release:        2
+Version:        %{srcversion}.%{bzr_commit}
+Release:        46
 Group:          Productivity/Networking/Security
-Source0:        apparmor-%{version}.tar.bz2
+Source0:        apparmor-%{srcversion}.tar.bz2
 Source1:        %{name}-profile-editor.png
 Source2:        %{name}-profile-editor.desktop
 Source3:        update-trans.sh
-Patch:          testsuite-build-fix
+Patch:		apparmor-2.5-%{bzr_commit}
 Patch1:         pam-apparmor-include
 Patch2:         mod_apparmor-includes
 Patch3:         tomcat-build-fixes
@@ -81,12 +84,15 @@ Patch25:        apparmor-2.5.1-ntpd-proc-fixes
 Patch26:        apparmor-2.5.1-edirectory-profile
 Patch27:        apparmor-2.5.1-firefox-proc-fix
 Patch28:        apparmor-2.5.1-unconfined-fixes
-Patch29:        apparmor-2.5.1-fix-parser-use-after-free
+Patch29:	apparmor-utils-inherit-flags-during-profile-generation
 Patch30:        apparmor-2.5.1-ldapclient-profile
-Patch31:        apparmor-utils-support-newer-auditd-formatted-messages
-Patch32:        fix-two-x-transition-conflict-bugs
+#Patch31:
+#Patch32:
 Patch33:        apparmor-2.5.1-ntpd-sys_nice
 Patch34:        apparmor-2.5.1-ssl-fix
+Patch35:	apparmor-2.5.1-dnsmasq-libvirt-profile-fix
+Patch36:	klog-needs-CAP_SYSLOG
+Patch37:	apparmor-2.5.1-network-fixes
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            https://launchpad.net/apparmor
@@ -157,6 +163,7 @@ Provides:       subdomain-parser-demo = %{version}
 Provides:       subdomain-parser-common = %{version}
 Provides:       subdomain-leaf-cert = %{version}
 Provides:       libimnxcert = %{version}
+Provides:	apparmor-parser(CAP_SYSLOG)
 
 %description parser
 The AppArmor Parser is a userlevel program that is used to load in
@@ -311,6 +318,7 @@ Summary:        AppArmor profiles that are loaded into the apparmor kernel modul
 Group:          Productivity/Security
 Obsoletes:      subdomain-profiles < %{version}
 Provides:       subdomain-profiles = %{version}
+Requires:	apparmor-parser(CAP_SYSLOG)
 
 %description profiles
 Base profiles. AppArmor is a file and network mandatory access control
@@ -453,7 +461,7 @@ SubDomain.
 %endif
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{srcversion}
 %patch -p1
 %patch1 -p1
 %patch2 -p1
@@ -485,10 +493,11 @@ SubDomain.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
-%patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
 
 %build
 export SUSE_ASNEEDED=0
@@ -658,7 +667,7 @@ fi
 %files profiles
 %defattr(-,root,root)
 %attr(644, root, root) %config(noreplace) %{profiles_dir}/*
-%attr(644, root, root) %config(noreplace) %{extras_dir}/*
+%attr(644, root, root) %{extras_dir}/*
 %dir %{_sysconfdir}/apparmor.d/
 %dir %{_sysconfdir}/apparmor/
 %dir %{_sysconfdir}/apparmor/profiles