Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2021-02-04 20:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Thu Feb 4 20:22:46 2021 rev:148 rq:868746 version:3.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2021-01-27 18:57:07.544330421 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new.28504/apparmor.changes 2021-02-04 20:23:30.394774410 +0100 @@ -1,0 +2,5 @@ +Tue Feb 2 18:35:17 UTC 2021 - Christian Boltz <[email protected]> + +- define %_pamdir for <= 15.x to fix the build on those releases + +------------------------------------------------------------------- @@ -6,0 +12,6 @@ + +------------------------------------------------------------------- +Wed Jan 13 10:45:18 UTC 2021 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + * use %_pamdir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.BSYnFy/_old 2021-02-04 20:23:31.086775464 +0100 +++ /var/tmp/diff_new_pack.BSYnFy/_new 2021-02-04 20:23:31.090775470 +0100 @@ -17,6 +17,17 @@ # +%if 0%{?usrmerged} +%define sbindir %_sbindir +%else +%define sbindir /sbin +%endif + +%if 0%{?suse_version} <= 1500 +# _pamdir isn't defined in 15.x +%define _pamdir /%{_lib}/security +%endif + # warning - confusing syntax ahead ;-) # bcond_with means "disable" # bcond_without means "enable" @@ -69,7 +80,7 @@ PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define apparmor_bin_prefix /lib/apparmor +%define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor BuildRequires: bison BuildRequires: dejagnu BuildRequires: flex @@ -427,7 +438,7 @@ test -f %{buildroot}/usr/share/apparmor/cache/*/bin.ping %endif -%makeinstall -C parser +%makeinstall SBINDIR="%{buildroot}%{sbindir}" APPARMOR_BIN_PREFIX="%{buildroot}%{apparmor_bin_prefix}" -C parser # default cache dir (up to 2.12) is /etc/apparmor.d/cache - not the best location. # Use /var/lib/apparmor/cache and make /etc/apparmor.d/cache a symlink to it mkdir -p %{buildroot}%{_localstatedir}/lib/apparmor/cache @@ -442,7 +453,7 @@ %endif %if %{with pam} - %makeinstall -C changehat/pam_apparmor SECDIR=%{buildroot}/%{_lib}/security + %makeinstall -C changehat/pam_apparmor SECDIR=%{buildroot}%{_pamdir} %endif %if %{with tomcat} @@ -493,7 +504,10 @@ %defattr(-,root,root) %license parser/COPYING.GPL %doc parser/README +%{sbindir}/apparmor_parser +%if !0%{?usrmerged} /sbin/apparmor_parser +%endif %{_bindir}/aa-enabled %{_bindir}/aa-exec %{_bindir}/aa-features-abi @@ -506,7 +520,7 @@ %dir %{_sysconfdir}/apparmor.d %{_sysconfdir}/apparmor.d/cache %{_sysconfdir}/apparmor.d/cache.d -/sbin/rcapparmor +%{sbindir}/rcapparmor %{_unitdir}/apparmor.service %config(noreplace) %{_sysconfdir}/apparmor/parser.conf %{_localstatedir}/lib/apparmor @@ -662,7 +676,7 @@ %files -n pam_apparmor %defattr(444,root,root,755) -%attr(555,root,root) /%{_lib}/security/pam_apparmor.so +%attr(555,root,root) %{_pamdir}/pam_apparmor.so %endif %if %{with tomcat}
