Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package busybox-links for openSUSE:Factory
checked in at 2021-03-10 08:46:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/busybox-links (Old)
and /work/SRC/openSUSE:Factory/.busybox-links.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox-links"
Wed Mar 10 08:46:40 2021 rev:16 rq:876543 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes
2021-02-07 15:14:31.613419025 +0100
+++ /work/SRC/openSUSE:Factory/.busybox-links.new.2378/busybox-links.changes
2021-03-10 08:46:59.526253368 +0100
@@ -1,0 +2,5 @@
+Tue Mar 2 14:40:42 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ busybox-links.spec ++++++
--- /var/tmp/diff_new_pack.lURhRd/_old 2021-03-10 08:47:00.150254012 +0100
+++ /var/tmp/diff_new_pack.lURhRd/_new 2021-03-10 08:47:00.154254016 +0100
@@ -588,9 +588,15 @@
touch used/ash
echo -e "%{_bindir}/hush" >> filelist-sh.txt
touch used/hush
-echo -e "/bin/sh\n%{_bindir}/sh" >> filelist-sh.txt
+%if !0%{?usrmerged}
+echo "/bin/sh" >> filelist-sh.txt
+%endif
+echo -e "%{_bindir}/sh" >> filelist-sh.txt
touch used/sh
-echo -e "/sbin/loadkmap\n%{_sbindir}/loadfont" >> filelist-kbd.txt
+%if !0%{?usrmerged}
+echo -e "/sbin/loadkmap" >> filelist-kbd.txt
+%endif
+echo -e "%{_sbindir}/loadfont" >> filelist-kbd.txt
touch used/loadkmap used/loadfont
echo -e
"/usr/sbin/addgroup\n/usr/sbin/adduser\n/usr/sbin/delgroup\n/usr/sbin/deluser"
>> filelist-shadow.txt
@@ -629,7 +635,9 @@
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
#ln -sf %{_bindir}/busybox %{buildroot}%{_sysconfdir}/alternatives/sh
ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh
+%if !0%{?usrmerged}
ln -sf %{_bindir}/sh %{buildroot}/bin/sh
+%endif
cp -av %{_bindir}/zgrep %{buildroot}%{_bindir}
cp -av %{_bindir}/zmore %{buildroot}%{_bindir}
sed -e 's|PAGER-more|PAGER-less|g' %{buildroot}%{_bindir}/zmore >
%{buildroot}%{_bindir}/zless
