Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2012-09-27 13:36:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apparmor", Maintainer is "MSzeredi@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2012-08-10 19:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2012-09-27 13:36:14.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 25 13:55:56 UTC 2012 - coolo@suse.com + +- fix directory flags for /etc/apparmor.d to be in sync between + -parser and -profiles subpackage + +------------------------------------------------------------------- +Fri Sep 21 19:58:32 UTC 2012 - opensuse@cboltz.de + +- remove %stop_on_removal for no longer existing aaeventd (bnc#781564) +- don't hide TeX output when building the parser and techdoc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.TLWyyx/_old 2012-09-27 13:36:15.000000000 +0200 +++ /var/tmp/diff_new_pack.TLWyyx/_new 2012-09-27 13:36:15.000000000 +0200 @@ -233,7 +233,7 @@ %package -n perl-apparmor Summary: Perl interface for libapparmor functions -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Development/Libraries/Perl Requires: libapparmor1 = %{version} Requires: perl = %{perl_version} @@ -254,7 +254,7 @@ %package -n python-apparmor Summary: Python interface for libapparmor functions -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Development/Libraries/Python BuildRequires: python Requires: libapparmor1 = %{version} @@ -272,7 +272,7 @@ %package -n ruby-apparmor Summary: Ruby interface for libapparmor functions -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Development/Libraries/Ruby Requires: libapparmor1 = %{version} Requires: ruby = %{ruby_version} @@ -287,7 +287,7 @@ %package profiles Summary: AppArmor profiles that are loaded into the apparmor kernel module -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Security Requires: apparmor-parser(CAP_SYSLOG) Obsoletes: subdomain-profiles < %{version} @@ -305,7 +305,7 @@ %package utils Summary: AppArmor User-Level Utilities Useful for Creating AppArmor Profiles -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Security Requires: libapparmor1 = %{version} Requires: perl = %{perl_version} @@ -322,7 +322,7 @@ %package -n tomcat_apparmor Summary: Tomcat 6 plugin for AppArmor change_hat -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: System/Libraries Requires: libapparmor1 = %{version} Requires: tomcat6 @@ -340,7 +340,7 @@ %package -n pam_apparmor Summary: PAM module for AppArmor change_hat -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Security BuildRequires: pam-devel PreReq: pam @@ -360,7 +360,7 @@ %package dbus Summary: Audit dispatcher for sending AppArmor events over DBUS -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: System/Monitoring %description dbus @@ -373,7 +373,7 @@ %package profile-editor Summary: AppArmor profile editor -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Editors/Other %description profile-editor @@ -385,7 +385,7 @@ %package -n apparmorapplet-gnome Summary: An AppArmor event notification applet for GNOME -License: GPL-2.0 ; LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: System/GUI/GNOME %description -n apparmorapplet-gnome @@ -458,9 +458,9 @@ # make -C utils check # parser: -make -C parser +make -C parser V=1 # techdoc.txt depends on techdoc.pdf and techdoc/index.html, so make techdoc.txt should be enough -make -C parser techdoc.txt +make -C parser V=1 techdoc.txt # make -C parser check # Apache mod_apparmor: @@ -634,7 +634,8 @@ %files profiles %defattr(644,root,root,755) -%config(noreplace) %{_sysconfdir}/apparmor.d/ +%dir %{_sysconfdir}/apparmor.d/ +%config(noreplace) %{_sysconfdir}/apparmor.d/* %exclude %{_sysconfdir}/apparmor.d/cache %dir %{_sysconfdir}/apparmor/ %dir %{_sysconfdir}/apparmor/profiles @@ -787,13 +788,9 @@ %preun parser if [ "$1" = 0 ] ; then %if %{distro} == "suse" - # TODO: aaeventd no longer exists - how to handle it? - %{stop_on_removal aaeventd} %{stop_on_removal boot.apparmor} %endif %if %{distro} == "redhat" || %{distro} == "rhel4" - # TODO: aaeventd no longer exists - how to handle it? - chkconfig --del aaeventd chkconfig --del apparmor %endif fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org