From 509735af61803de3c237fe969b23455c3c68e41d64e9492c6ba61ba09ea508fe Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sat, 21 Nov 2015 01:15:34 +0000 Subject: [PATCH 1/2] - instead of owning the apparmor directories, BR apparmor-profiles. OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=124 --- haproxy.changes | 5 +++++ haproxy.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/haproxy.changes b/haproxy.changes index 0441e00..a90b4b7 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 21 01:15:07 UTC 2015 - mrueckert@suse.de + +- instead of owning the apparmor directories, BR apparmor-profiles. + ------------------------------------------------------------------- Tue Nov 10 14:50:26 UTC 2015 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 9b4ea66..3f168c5 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -46,6 +46,9 @@ Release: 0 # # BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with apparmor} +BuildRequires: apparmor-profiles +%endif BuildRequires: libgcrypt-devel %if %{with lua} BuildRequires: lua-devel >= 5.3 @@ -228,8 +231,6 @@ rm examples/haproxy.spec examples/*init* examples/haproxy.vim %{_mandir}/man1/%{pkg_name}.1.gz %{vim_data_dir}/syntax/%{pkg_name}.vim %if %{with apparmor} -%dir /etc/apparmor.d/ -%dir /etc/apparmor.d/local/ %config(noreplace) /etc/apparmor.d/usr.sbin.haproxy %config(noreplace) /etc/apparmor.d/local/usr.sbin.haproxy %endif From e7412317a359317e9f73bcf4178fbbc50aad4535a42fb6468a6647167b9905cf Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sat, 21 Nov 2015 01:36:28 +0000 Subject: [PATCH 2/2] - on sle11 we still need to own /etc/apparmor.d/local OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=125 --- haproxy.changes | 5 +++++ haproxy.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/haproxy.changes b/haproxy.changes index a90b4b7..1a7dbca 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 21 01:36:11 UTC 2015 - mrueckert@suse.de + +- on sle11 we still need to own /etc/apparmor.d/local + ------------------------------------------------------------------- Sat Nov 21 01:15:07 UTC 2015 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 3f168c5..5b20821 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -231,6 +231,9 @@ rm examples/haproxy.spec examples/*init* examples/haproxy.vim %{_mandir}/man1/%{pkg_name}.1.gz %{vim_data_dir}/syntax/%{pkg_name}.vim %if %{with apparmor} +%if 0%{?suse_version} == 1110 +%dir /etc/apparmor.d/local/ +%endif %config(noreplace) /etc/apparmor.d/usr.sbin.haproxy %config(noreplace) /etc/apparmor.d/local/usr.sbin.haproxy %endif