Accepting request 312166 from home:cboltz

- systemd-rpm-macros and %systemd_requires were at the wrong place,
  move them to the parser package (boo#931792)

OBS-URL: https://build.opensuse.org/request/show/312166
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=133
This commit is contained in:
Christian Boltz 2015-06-15 22:42:34 +00:00 committed by Git OBS Bridge
parent 7a649ea462
commit b9a02e50dc
2 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 15 22:13:21 UTC 2015 - opensuse@cboltz.de
- systemd-rpm-macros and %systemd_requires were at the wrong place,
move them to the parser package (boo#931792)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 24 20:21:32 UTC 2015 - opensuse@cboltz.de Fri Apr 24 20:21:32 UTC 2015 - opensuse@cboltz.de

View File

@ -98,6 +98,7 @@ Patch6: apparmor-abstractions-no-multiline.diff
Patch7: apparmor-lessopen-profile.patch Patch7: apparmor-lessopen-profile.patch
# update samba (winbindd and nmb) profiles for samba 4.2 (boo#921098, boo#923201) # update samba (winbindd and nmb) profiles for samba 4.2 (boo#921098, boo#923201)
# commited upstream trunk r3038, 2.9 r2917 (2.9 commit doesn't include the /var/lib/samba/... cleanup in the winbindd profile)
Patch10: samba-4.2-profiles.diff Patch10: samba-4.2-profiles.diff
Url: https://launchpad.net/apparmor Url: https://launchpad.net/apparmor
@ -150,11 +151,6 @@ BuildRequires: java-devel >= 1.6.0
BuildRequires: tomcat6 BuildRequires: tomcat6
%endif %endif
%if 0%{?suse_version} > 1320
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%endif
%package parser %package parser
Summary: AppArmor userlevel parser utility Summary: AppArmor userlevel parser utility
License: GPL-2.0+ License: GPL-2.0+
@ -176,6 +172,11 @@ Provides: apparmor-parser(CAP_SYSLOG)
# initscript needs /lib/lsb/init-functions from insserv/insserv-compat # initscript needs /lib/lsb/init-functions from insserv/insserv-compat
Requires: insserv Requires: insserv
%if 0%{?suse_version} > 1320
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%endif
%description parser %description parser
The AppArmor Parser is a userlevel program that is used to load in The AppArmor Parser is a userlevel program that is used to load in
program profiles to the AppArmor Security kernel module. program profiles to the AppArmor Security kernel module.