From 1c82082ae664d1fe025d64d525f5a8272a48603a48a5e73dd6a24cd05c2b3fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 9 Feb 2021 09:39:40 +0000 Subject: [PATCH 1/2] Accepting request 868668 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/868668 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=570 --- rpm.changes | 5 +++++ rpm.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/rpm.changes b/rpm.changes index 3354070..1d67bc3 100644 --- a/rpm.changes +++ b/rpm.changes @@ -70,6 +70,11 @@ Mon Oct 19 11:53:00 CEST 2020 - mls@suse.de - Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428] * new patch: touch_backport.diff +------------------------------------------------------------------- +Fri Oct 16 08:42:08 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Fri Oct 9 13:28:33 UTC 2020 - Guillaume GARDET diff --git a/rpm.spec b/rpm.spec index a46f303..73ebfee 100644 --- a/rpm.spec +++ b/rpm.spec @@ -307,7 +307,9 @@ mkdir -p %{buildroot}/usr/share/locale 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 @@ -428,7 +430,9 @@ fi %doc doc/manual %doc RPM-HOWTO /etc/rpm +%if !0%{?usrmerged} /bin/rpm +%endif %{_bindir}/gendiff %{_bindir}/rpm %{_bindir}/rpm2cpio From 4e5271c59483f24f9b6af91c95088331d6bb1e40301d35c3df5faaa87d6be6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 9 Feb 2021 09:40:20 +0000 Subject: [PATCH 2/2] Accepting request 870226 from home:Andreas_Schwab:Factory - Use shipped config.sub/config.guess instead of stone-aged from libtool - auto-config-update-aarch64-ppc64le.diff: update grep regex OBS-URL: https://build.opensuse.org/request/show/870226 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=571 --- auto-config-update-aarch64-ppc64le.diff | 2 +- rpm.changes | 6 ++++++ rpm.spec | 7 +++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff index 907d75f..9020e38 100644 --- a/auto-config-update-aarch64-ppc64le.diff +++ b/auto-config-update-aarch64-ppc64le.diff @@ -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" + ); diff --git a/rpm.changes b/rpm.changes index 1d67bc3..5f4d050 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 8 09:38:33 UTC 2021 - Andreas Schwab + +- Use shipped config.sub/config.guess instead of stone-aged from libtool +- auto-config-update-aarch64-ppc64le.diff: update grep regex + ------------------------------------------------------------------- Thu Jan 14 15:40:39 UTC 2021 - Matej Cepl diff --git a/rpm.spec b/rpm.spec index 73ebfee..d9d500b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -233,7 +233,6 @@ Provides and requires generator for .pl files and modules. %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 db 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 @@ -369,8 +368,8 @@ for i in /usr/share/automake-*/*; do 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