Accepting request 196152 from home:cboltz

- add apparmor-no-perl-smartmatch-r2088.diff: ~~ was marked as experimental
  in perl 5.18 again - use grep instead (upstream 2.8 branch r2088)
- fix ruby requires

OBS-URL: https://build.opensuse.org/request/show/196152
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=42
This commit is contained in:
2013-08-23 22:02:24 +00:00
committed by Git OBS Bridge
parent 644c700c5c
commit cdba64057c
3 changed files with 34 additions and 1 deletions

View File

@@ -85,6 +85,9 @@ Patch1: apparmor-enable-profile-cache.diff
# include autogenerated profile sniplet for samba shares (bnc#688040)
Patch2: apparmor-samba-include-permissions-for-shares.diff
# use grep instead of ~~ (smartmatch) because ~~ was marked as experimental again in perl 5.18 (upstream trunk r2158, 2.8 r2088)
Patch3: apparmor-no-perl-smartmatch-r2088.diff
# split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width.
Patch5: apparmor-utils-string-split
@@ -317,7 +320,7 @@ Summary: Ruby interface for libapparmor functions
License: GPL-2.0 and LGPL-2.1+
Group: Development/Languages/Ruby
Requires: libapparmor1 = %{version}
Requires: ruby = %{rb_ver}
Requires: ruby = %(rpm -q --qf '%%{version}' ruby)
Provides: ruby-libapparmor = %{version}
Obsoletes: ruby-libapparmor < 2.5
@@ -454,6 +457,7 @@ SubDomain.
%setup -q
%patch1 -p1
%patch2 -p0
%patch3
%patch5 -p1
%patch12 -p1