Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2021-02-15 23:10:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Mon Feb 15 23:10:16 2021 rev:286 rq:870434 version:4.16.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2021-02-02 14:24:21.159268729
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.28504/rpm.changes 2021-02-15
23:10:16.574855965 +0100
@@ -1,0 +2,6 @@
+Mon Feb 8 09:38:33 UTC 2021 - Andreas Schwab <sch...@suse.de>
+
+- Use shipped config.sub/config.guess instead of stone-aged from libtool
+- auto-config-update-aarch64-ppc64le.diff: update grep regex
+
+-------------------------------------------------------------------
@@ -71,0 +78,5 @@
+
+-------------------------------------------------------------------
+Fri Oct 16 08:42:08 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.EcHeuo/_old 2021-02-15 23:10:19.038859645 +0100
+++ /var/tmp/diff_new_pack.EcHeuo/_new 2021-02-15 23:10:19.038859645 +0100
@@ -233,7 +233,6 @@
%prep
%setup -q -n rpm-%{version}
rm -rf sqlite
-cp /usr/share/libtool/build-aux/config.guess
/usr/share/libtool/build-aux/config.sub .
%if 0%{?!without_bdb:1}
tar xjf %{SOURCE11}
ln -s db-4.8.30 db
@@ -242,7 +241,7 @@
cd ..
chmod -R u+w db/*
rm -f rpmdb/db.h
-cp config.guess config.sub db/dist/
+cp build-aux/config.guess build-aux/config.sub db/dist/
%endif
%patch5 -p1
%patch -P 11 -P 12 -P 13 -P 15 -P 16 -P 18
@@ -307,7 +306,9 @@
ln -s ../share/locale %{buildroot}/usr/lib/locale
%make_install
mkdir -p %{buildroot}/bin
+%if !0%{?usrmerged}
ln -s /usr/bin/rpm %{buildroot}/bin/rpm
+%endif
%if 0%{?!without_bdb:1}
install -m 644 db3/db.h %{buildroot}/usr/include/rpm
%endif
@@ -367,8 +368,8 @@
done
popd
%ifarch aarch64 ppc64le riscv64
-install -m 755 config.guess %{buildroot}/usr/lib/rpm
-install -m 755 config.sub %{buildroot}/usr/lib/rpm
+install -m 755 build-aux/config.guess %{buildroot}/usr/lib/rpm
+install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm
%endif
rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
rm -f %{buildroot}%{_libdir}/*.la
@@ -428,7 +429,9 @@
%doc doc/manual
%doc RPM-HOWTO
/etc/rpm
+%if !0%{?usrmerged}
/bin/rpm
+%endif
%{_bindir}/gendiff
%{_bindir}/rpm
%{_bindir}/rpm2cpio
++++++ auto-config-update-aarch64-ppc64le.diff ++++++
--- /var/tmp/diff_new_pack.EcHeuo/_old 2021-02-15 23:10:19.090859723 +0100
+++ /var/tmp/diff_new_pack.EcHeuo/_new 2021-02-15 23:10:19.090859723 +0100
@@ -16,7 +16,7 @@
+ "for s in guess sub; do\n"
+ " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+ " grep -q config-patches@ $c || continue\n"
-+ " grep -q $testarch\\[-:\\] $c || install -m 755
$ref/config.$s $c\n"
++ " grep -q \"$testarch[-: ]\" $c || install -m 755
$ref/config.$s $c\n"
+ " done\n"
+ "done\n"
+ );
