Hello community, here is the log from the commit of package cpio for openSUSE:Factory checked in at 2020-11-26 23:09:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpio (Old) and /work/SRC/openSUSE:Factory/.cpio.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpio" Thu Nov 26 23:09:36 2020 rev:61 rq:850283 version:2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/cpio/cpio.changes 2020-09-18 14:28:03.131269323 +0200 +++ /work/SRC/openSUSE:Factory/.cpio.new.5913/cpio.changes 2020-11-26 23:10:17.708882580 +0100 @@ -1,0 +2,5 @@ +Fri Oct 16 08:49:00 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpio.spec ++++++ --- /var/tmp/diff_new_pack.HlSdNO/_old 2020-11-26 23:10:18.360883222 +0100 +++ /var/tmp/diff_new_pack.HlSdNO/_new 2020-11-26 23:10:18.360883222 +0100 @@ -102,9 +102,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man} -#UsrMerge +%if !0%{?usrmerged} ln -sf %{_bindir}/cpio %{buildroot}/bin -#EndUsrMerge +%endif %find_lang %{name} @@ -130,9 +130,9 @@ %files %license COPYING %doc NEWS ChangeLog -#UsrMerge +%if !0%{?usrmerged} /bin/cpio -#EndUsrMerge +%endif %{_bindir}/cpio %{_infodir}/cpio.info%{?ext_info} %{_mandir}/man1/cpio.1%{?ext_man} _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org