diff --git a/apparmor.changes b/apparmor.changes index d479bd9..714e898 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 14 18:51:26 UTC 2017 - suse-beta@cboltz.de + +- don't rely on implementation details for reload in %post + ------------------------------------------------------------------- Wed Jul 12 13:33:20 UTC 2017 - rgoldwyn@suse.com diff --git a/apparmor.spec b/apparmor.spec index ad69102..fdee0a2 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -80,6 +80,8 @@ Patch10: upstream-changes-r3629..3648.diff # add some exceptions to utils/test/test-parser-simple-tests.py (submitted upstream 2017-03-25) Patch11: parser-tests-dbus-duplicated-conditionals.diff + +# add JSON support to aa-logprof and aa-genprof (will be in upstream 2.12) Patch12: apparmor-yast-cleanup.patch Patch13: apparmor-json-support.patch @@ -741,14 +743,14 @@ export DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun apparmor.service %post abstractions -#restart_on_update boot.apparmor - but non-broken (bnc#853019) -systemctl is-active -q apparmor && /lib/apparmor/apparmor.systemd reload ||: +#restart_on_update apparmor - but non-broken (bnc#853019) +systemctl is-active -q apparmor && systemctl reload apparmor ||: %post profiles # workaround for bnc#904620#c8 / lp#1392042 rm -f /var/lib/apparmor/cache/* 2>/dev/null -#restart_on_update boot.apparmor - but non-broken (bnc#853019) -systemctl is-active -q apparmor && /lib/apparmor/apparmor.systemd reload ||: +#restart_on_update apparmor - but non-broken (bnc#853019) +systemctl is-active -q apparmor && systemctl reload apparmor ||: %if %{with tomcat}