Accepting request 59942 from security:apparmor:factory

Accepted submit request 59942 from user jeff_mahoney

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

apparmor.spec

@@ -49,13 +49,13 @@ Name:           apparmor
 %endif
 Summary:        AppArmor userlevel parser utility
 Version:        %{srcversion}.%{bzr_commit}
-Release:        1
+Release:        49
 Group:          Productivity/Networking/Security
 Source0:        apparmor-%{srcversion}.tar.bz2
 Source1:        %{name}-profile-editor.png
 Source2:        %{name}-profile-editor.desktop
 Source3:        update-trans.sh
-Patch:          apparmor-2.5-%{bzr_commit}
+Patch:		apparmor-2.5-%{bzr_commit}
 Patch1:         pam-apparmor-include
 Patch2:         mod_apparmor-includes
 Patch3:         tomcat-build-fixes
@@ -84,15 +84,16 @@ 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-utils-inherit-flags-during-profile-generation
+Patch29:	apparmor-utils-inherit-flags-during-profile-generation
 Patch30:        apparmor-2.5.1-ldapclient-profile
-#Patch31:
-#Patch32:
+Patch31:	genprof-whitespace-in-profile-fix
+Patch32:	apparmor-remove-repo
 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
+Patch35:	apparmor-2.5.1-dnsmasq-libvirt-profile-fix
+Patch36:	klog-needs-CAP_SYSLOG
+Patch37:	apparmor-2.5.1-network-fixes
+Patch38:	apparmor-profiles-dhclient
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            https://launchpad.net/apparmor
@@ -163,7 +164,7 @@ Provides:       subdomain-parser-demo = %{version}
 Provides:       subdomain-parser-common = %{version}
 Provides:       subdomain-leaf-cert = %{version}
 Provides:       libimnxcert = %{version}
-Provides:       apparmor-parser(CAP_SYSLOG)
+Provides:	apparmor-parser(CAP_SYSLOG)
 
 %description parser
 The AppArmor Parser is a userlevel program that is used to load in
@@ -318,7 +319,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)
+Requires:	apparmor-parser(CAP_SYSLOG)
 
 %description profiles
 Base profiles. AppArmor is a file and network mandatory access control
@@ -493,11 +494,14 @@ SubDomain.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 %build
 export SUSE_ASNEEDED=0