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-12-01 20:46:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/busybox-links (Old)
and /work/SRC/openSUSE:Factory/.busybox-links.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox-links"
Wed Dec 1 20:46:32 2021 rev:20 rq:928281 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes
2021-08-04 22:29:19.281770040 +0200
+++ /work/SRC/openSUSE:Factory/.busybox-links.new.31177/busybox-links.changes
2021-12-02 02:10:41.991496088 +0100
@@ -1,0 +2,12 @@
+Fri Oct 22 15:57:07 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Removed libalternatives machanism. Using direct link from
+ /usr/bin/busybox to /usr/bin/sh. The package is conflicting with
+ the new packages bash-sh which has a link for /usr/bin/sh too.
+
+-------------------------------------------------------------------
+Wed Aug 18 14:00:55 UTC 2021 - Stefan Schubert <sch...@suse.com>
+
+- Use libalternatives instead of update-alternatives.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ busybox-links.spec ++++++
--- /var/tmp/diff_new_pack.rc3c4T/_old 2021-12-02 02:10:42.491494563 +0100
+++ /var/tmp/diff_new_pack.rc3c4T/_new 2021-12-02 02:10:42.495494552 +0100
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1500
+%bcond_with alternatives
+%else
+%bcond_without alternatives
+%endif
+
Name: busybox-links
Version: %(rpm -q busybox --qf '%%{VERSION}')
Release: 0
@@ -156,12 +162,17 @@
%package -n busybox-sh
Summary: Busybox sh, ash and hush
-BuildRequires: update-alternatives
Requires: busybox = %{version}
Requires(post): busybox
-Requires(post): update-alternatives
Requires(preun):busybox
+%if %{with alternatives}
+BuildRequires: update-alternatives
+Requires(post): update-alternatives
Requires(preun):update-alternatives
+%else
+Provides: alternative(sh)
+Conflicts: alternative(sh)
+%endif
Obsoletes: busybox-ash < %{version}
%description -n busybox-sh
@@ -635,10 +646,13 @@
mkdir -p %{buildroot}%{_bindir}
bash ./busybox.install %{buildroot} --symlinks
rm %{buildroot}%{_bindir}/busybox
+%if %{with alternatives}
# sh needs to be handled by update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-#ln -sf %{_bindir}/busybox %{buildroot}%{_sysconfdir}/alternatives/sh
ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh
+%else
+ln -sf %{_bindir}/busybox %{buildroot}%{_bindir}/sh
+%endif
%if !0%{?usrmerged}
ln -sf %{_bindir}/sh %{buildroot}/bin/sh
%endif
@@ -647,6 +661,7 @@
sed -e 's|PAGER-more|PAGER-less|g' %{buildroot}%{_bindir}/zmore >
%{buildroot}%{_bindir}/zless
chmod 755 %{buildroot}%{_bindir}/zless
+%if %{with alternatives}
%post -n busybox-sh -p /usr/bin/ash
%{_sbindir}/update-alternatives --quiet --force \
--install %{_bindir}/sh sh %{_bindir}/busybox 10000
@@ -655,6 +670,7 @@
if test "$1" = 0; then
%{_sbindir}/update-alternatives --quiet --remove sh %{_bindir}/busybox
fi
+%endif
%files
@@ -760,6 +776,13 @@
%files -n busybox-xz -f filelist-xz.txt
%files -n busybox-sh -f filelist-sh.txt
+%if %{with alternatives}
%ghost %config %{_sysconfdir}/alternatives/sh
+%else
+%if !0%{?usrmerged}
+/bin/sh
+%endif
+%{_bindir}/sh
+%endif
%changelog
