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 2023-01-10 14:59:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/busybox-links (Old)
and /work/SRC/openSUSE:Factory/.busybox-links.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox-links"
Tue Jan 10 14:59:09 2023 rev:26 rq:1057009 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes
2022-09-19 16:02:48.314065170 +0200
+++ /work/SRC/openSUSE:Factory/.busybox-links.new.32243/busybox-links.changes
2023-01-10 14:59:22.337065653 +0100
@@ -1,0 +2,5 @@
+Tue Dec 27 10:28:04 UTC 2022 - Ludwig Nussel <lnus...@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check
(boo#1206798)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ busybox-links.spec ++++++
--- /var/tmp/diff_new_pack.e9nTJv/_old 2023-01-10 14:59:22.813068201 +0100
+++ /var/tmp/diff_new_pack.e9nTJv/_new 2023-01-10 14:59:22.817068222 +0100
@@ -1,7 +1,7 @@
#
# spec file for package busybox-links
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -615,12 +615,12 @@
touch used/ash
echo -e "%{_bindir}/hush" >> filelist-sh.txt
touch used/hush
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
echo "/bin/sh" >> filelist-sh.txt
%endif
echo -e "%{_bindir}/sh" >> filelist-sh.txt
touch used/sh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
echo -e "/sbin/loadkmap" >> filelist-kbd.txt
%endif
echo -e "%{_sbindir}/loadfont" >> filelist-kbd.txt
@@ -659,7 +659,7 @@
bash ./busybox.install %{buildroot} --symlinks
rm %{buildroot}%{_bindir}/busybox
ln -sf %{_bindir}/busybox %{buildroot}%{_bindir}/sh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
ln -sf %{_bindir}/sh %{buildroot}/bin/sh
%endif
install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/zless
