Maually merge SR 243200 by dimstar

Descr: Rename rpmlintrc as per pkg guideline to %{name}-rpmlintrc

Also add upstream commit revisions for the perl-apparmor* patches

OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=91
This commit is contained in:
2014-08-02 10:53:38 +00:00
committed by Git OBS Bridge
parent 0525bb6f3c
commit 95b82b4e5d
3 changed files with 10 additions and 4 deletions

View File

@@ -75,7 +75,7 @@ Source3: %{name}-profile-editor.png
Source4: %{name}-profile-editor.desktop
Source5: update-trans.sh
Source6: baselibs.conf
Source7: rpmlintrc
Source7: apparmor-rpmlintrc
# profile for winbindd (bnc#748499, submitted upstream 2012-11-06, trunk r2078)
Source10: usr.sbin.winbindd
@@ -123,13 +123,13 @@ Patch23: apparmor-2.8.2-nm-dnsmasq-config.patch
# Permit clustered Samba access to CTDB socket and databases (bnc#885317, commited upstream trunk r2556 - TODO: merge into 2.8 branch)
Patch24: apparmor-profiles-clustered-samba.diff
# perl-apparmor: Fix handling of network (or network all) (bnc#889650)
# perl-apparmor: Fix handling of network (or network all) (bnc#889650) (commited upstream trunk r2571, 2.8 r2135)
Patch25: perl-apparmor-fix-bare-network-keyword-handling.diff
# perl-apparmor: Fix handling of capability keyword (bnc#889651)
# perl-apparmor: Fix handling of capability keyword (bnc#889651) (commited upstream trunk r2572, 2.8 r2136)
Patch26: perl-apparmor-handle-bare-capability-keyword.diff
# perl-apparmor: Properly handle bare file keyword (bnc#889652)
# perl-apparmor: Properly handle bare file keyword (bnc#889652) (commited upstream trunk r2573, 2.8 )
Patch27: perl-apparmor-properly-handle-bare-file-keyword.diff
Url: https://launchpad.net/apparmor