Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at Tue Jul 5 13:45:39 CEST 2011. -------- --- apparmor/apparmor.changes 2011-03-24 21:33:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/apparmor/apparmor.changes 2011-06-24 16:06:28.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 24 16:02:21 CEST 2011 - jeffm@suse.de + +- Fixed building of pam_apparmor to properly link libpam (bnc#696553). +- Fixed building of apache2-mod_apparmor to properly link (bnc#701821). + +------------------------------------------------------------------- +Wed Apr 27 17:28:58 UTC 2011 - opensuse@cboltz.de + +- make the -doc and -profiles subpackages noarch (again) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.aT7BqT/_old 2011-07-05 13:44:20.000000000 +0200 +++ /var/tmp/diff_new_pack.aT7BqT/_new 2011-07-05 13:44:20.000000000 +0200 @@ -46,7 +46,7 @@ %endif Summary: AppArmor userlevel parser utility Version: 2.6.0 -Release: 1 +Release: 56 Group: Productivity/Networking/Security Source0: apparmor-%{version}.tar.bz2 Source1: %{name}-profile-editor.png @@ -157,6 +157,7 @@ License: GPLv2+ Summary: AppArmor Documentation package Group: Documentation/Other +BuildArch: noarch %description docs This package contains documentation for AppArmor. @@ -301,6 +302,7 @@ Obsoletes: subdomain-profiles < %{version} Provides: subdomain-profiles = %{version} Requires: apparmor-parser(CAP_SYSLOG) +BuildArch: noarch %description profiles Base profiles. AppArmor is a file and network mandatory access control @@ -707,7 +709,6 @@ %files -n apache2-mod_apparmor %defattr(-,root,root) %{apache_module_path}/mod_apparmor.so -%{apache_module_path}/mod_apparmor.la %doc %{_mandir}/man8/mod_apparmor.8.gz %endif ++++++ apparmor-2.5.1-unified-build ++++++ --- /var/tmp/diff_new_pack.aT7BqT/_old 2011-07-05 13:44:20.000000000 +0200 +++ /var/tmp/diff_new_pack.aT7BqT/_new 2011-07-05 13:44:20.000000000 +0200 @@ -304,6 +304,44 @@ libraries/libapparmor/config.guess | 1502 - libraries/libapparmor/config.sub | 1714 - libraries/libapparmor/configure |13962 ---------- + AUTHORS | 1 + ChangeLog | 1 + INSTALL | 365 + Makefile.am | 2 + NEWS | 1 + changehat/Makefile.am | 1 + changehat/mod_apparmor/Makefile.am | 23 + changehat/mod_apparmor/apache2-mod_apparmor.spec.in | 215 + changehat/pam_apparmor/COPYING | 39 + changehat/pam_apparmor/Makefile.am | 9 + changehat/pam_apparmor/pam_apparmor.changes | 49 + changehat/pam_apparmor/pam_apparmor.spec.in | 83 + changehat/tomcat_apparmor/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_0/Makefile.am | 2 + changehat/tomcat_apparmor/tomcat_5_5/Makefile.am | 13 + changehat/tomcat_apparmor/tomcat_5_5/build.xml | 11 + changehat/tomcat_apparmor/tomcat_5_5/src/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/Makefile.am | 17 + config.rpath | 666 + configure.in | 203 + deprecated/Makefile.am | 2 + deprecated/management/Makefile.am | 1 + deprecated/management/apparmor-dbus/Makefile.am | 2 + deprecated/management/apparmor-dbus/src/Makefile.am | 3 + deprecated/management/profile-editor/Makefile.am | 2 + deprecated/management/profile-editor/src/Makefile.am | 6 + deprecated/management/profile-editor/src/wxStyledTextCtrl/Makefile.am | 4 + libraries/Makefile.am | 1 + libraries/libapparmor/AUTHORS | 2 + libraries/libapparmor/ChangeLog | 1 + libraries/libapparmor/INSTALL | 236 + libraries/libapparmor/NEWS | 1 + libraries/libapparmor/README | 1 + libraries/libapparmor/autogen.sh | 42 + libraries/libapparmor/compile | 143 + libraries/libapparmor/config.guess | 1502 - + libraries/libapparmor/config.sub | 1714 - + libraries/libapparmor/configure |13962 ---------- libraries/libapparmor/doc/Makefile.am | 14 libraries/libapparmor/install-sh | 520 libraries/libapparmor/libapparmor1.spec | 178 @@ -341,7 +379,7 @@ utils/Makefile.PL | 15 utils/Makefile.am | 36 utils/po/Makefile | 8 - 75 files changed, 5126 insertions(+), 22112 deletions(-) + 75 files changed, 5130 insertions(+), 22112 deletions(-) --- /dev/null +++ b/AUTHORS @@ -734,18 +772,22 @@ +SUBDIRS = mod_apparmor pam_apparmor tomcat_apparmor --- /dev/null +++ b/changehat/mod_apparmor/Makefile.am -@@ -0,0 +1,19 @@ +@@ -0,0 +1,23 @@ +if HAVE_APACHE -+apache_module_LTLIBRARIES = mod_apparmor.la -+mod_apparmor_la_SOURCES = mod_apparmor.la -+mod_apparmor_la_LDFLAGS = -module -avoid-version -+mod_apparmor_la_LIBADD = ../../libraries/libapparmor/src/libapparmor.la -+ -+man_MANS = mod_apparmor.8 +INCLUDES = "-I../../libraries/libapparmor/src" ++LIBAPPARMOR="../../libraries/libapparmor/src/libapparmor.la" + -+#.c.so: -+# $(APXS) $(APXS_FLAGS) -c $< ++all-local: module ++ ++module: mod_apparmor.c ++ if test "$(srcdir)" != "."; then $(CP) $(srcdir)/mod_apparmor.c . ; fi ++ $(APXS) -c $(INCLUDES) $(LIBAPPARMOR) $< ++ ++install-exec-local: module ++ $(MKDIR_P) $(DESTDIR)$(apache_moduledir) ++ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(apache_moduledir) -i mod_apparmor.la ++ ++man_MANS = mod_apparmor.8 + +PODARGS = --center=AppArmor --release=NOVELL/SUSE + @@ -1022,7 +1064,7 @@ +security_LTLIBRARIES = pam_apparmor.la +pam_apparmor_la_SOURCES = pam_apparmor.c get_options.c +pam_apparmor_la_LDFLAGS = -module -avoid-version -+pam_apparmor_la_LIBADD = ../../libraries/libapparmor/src/libapparmor.la ++pam_apparmor_la_LIBADD = ../../libraries/libapparmor/src/libapparmor.la -lpam + +INCLUDES = "-I../../libraries/libapparmor/src" +endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org