Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2020-11-26 23:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "e2fsprogs" Thu Nov 26 23:08:51 2020 rev:113 rq:849645 version:1.45.6 Changes: -------- --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2020-05-11 13:25:39.655143809 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.5913/e2fsprogs.changes 2020-11-26 23:08:54.344800517 +0100 @@ -1,0 +2,5 @@ +Thu Oct 29 10:31:32 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.PViZav/_old 2020-11-26 23:08:55.232801391 +0100 +++ /var/tmp/diff_new_pack.PViZav/_new 2020-11-26 23:08:55.232801391 +0100 @@ -287,7 +287,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper -#UsrMerge +%if !0%{?usrmerged} mkdir %{buildroot}/sbin ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs @@ -314,7 +314,7 @@ for libName in $LIBNAMES; do ln -s %{_libdir}/$libName %{buildroot}/%{_lib}; done -#EndUsrMerge +%endif %if %{with systemd} %if %{build_mini} @@ -403,7 +403,7 @@ %license NOTICE %endif %config /etc/mke2fs.conf -#UsrMerge +%if !0%{?usrmerged} /sbin/badblocks /sbin/debugfs /sbin/dumpe2fs @@ -422,7 +422,7 @@ /sbin/tune2fs /sbin/e2image /sbin/logsave -#EndUsrMerge +%endif %{_sbindir}/badblocks %{_sbindir}/debugfs %{_sbindir}/dumpe2fs @@ -487,10 +487,10 @@ %files -n libext2fs2 %endif %defattr(-, root, root) -#UsrMerge +%if !0%{?usrmerged} /%{_lib}/libext2fs.so.* /%{_lib}/libe2p.so.* -#EndUsrMerge +%endif %{_libdir}/libext2fs.so.* %{_libdir}/libe2p.so.* @@ -513,10 +513,10 @@ %files -n libcom_err2 %endif %defattr(-, root, root) -#UsrMerge +%if !0%{?usrmerged} /%{_lib}/libcom_err.so.* /%{_lib}/libss.so.* -#EndUsrMerge +%endif %{_libdir}/libcom_err.so.* %{_libdir}/libss.so.* _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
