pool/rpm
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 870434 from Base:System

Browse Source 
- Use shipped config.sub/config.guess instead of stone-aged from libtool
- auto-config-update-aarch64-ppc64le.diff: update grep regex (forwarded request 870226 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/870434
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=286
This commit is contained in:
Dominique Leuenberger 2021-02-15 22:10:16 +00:00 committed by Git OBS Bridge
commit d105e4320a
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto-config-update-aarch64-ppc64le.diff
View File

@ -16,7 +16,7 @@
+ "for s in guess sub; do\n" + "for s in guess sub; do\n"
+ " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n" + " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+ " grep -q config-patches@ $c || continue\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"
+ "done\n" + "done\n"
+ ); + );

11
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 8 09:38:33 UTC 2021 - Andreas Schwab <schwab@suse.de>
- 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 <mcepl@suse.com> Thu Jan 14 15:40:39 UTC 2021 - Matej Cepl <mcepl@suse.com>
@ -70,6 +76,11 @@ Mon Oct 19 11:53:00 CEST 2020 - mls@suse.de
- Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428] - Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428]
* new patch: touch_backport.diff * new patch: touch_backport.diff
-------------------------------------------------------------------
Fri Oct 16 08:42:08 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 9 13:28:33 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org> Fri Oct 9 13:28:33 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

11
rpm.spec
View File

@ -233,7 +233,6 @@ Provides and requires generator for .pl files and modules.
%prep %prep
%setup -q -n rpm-%{version} %setup -q -n rpm-%{version}
rm -rf sqlite rm -rf sqlite
cp /usr/share/libtool/build-aux/config.guess /usr/share/libtool/build-aux/config.sub .
%if 0%{?!without_bdb:1} %if 0%{?!without_bdb:1}
tar xjf %{SOURCE11} tar xjf %{SOURCE11}
ln -s db-4.8.30 db ln -s db-4.8.30 db
@ -242,7 +241,7 @@ cd db
cd .. cd ..
chmod -R u+w db/* chmod -R u+w db/*
rm -f rpmdb/db.h rm -f rpmdb/db.h
cp config.guess config.sub db/dist/ cp build-aux/config.guess build-aux/config.sub db/dist/
%endif %endif
%patch5 -p1 %patch5 -p1
%patch -P 11 -P 12 -P 13 -P 15 -P 16 -P 18 %patch -P 11 -P 12 -P 13 -P 15 -P 16 -P 18
@ -307,7 +306,9 @@ mkdir -p %{buildroot}/usr/share/locale
ln -s ../share/locale %{buildroot}/usr/lib/locale ln -s ../share/locale %{buildroot}/usr/lib/locale
%make_install %make_install
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
%if !0%{?usrmerged}
ln -s /usr/bin/rpm %{buildroot}/bin/rpm ln -s /usr/bin/rpm %{buildroot}/bin/rpm
%endif
%if 0%{?!without_bdb:1} %if 0%{?!without_bdb:1}
install -m 644 db3/db.h %{buildroot}/usr/include/rpm install -m 644 db3/db.h %{buildroot}/usr/include/rpm
%endif %endif
@ -367,8 +368,8 @@ for i in /usr/share/automake-*/*; do
done done
popd popd
%ifarch aarch64 ppc64le riscv64 %ifarch aarch64 ppc64le riscv64
install -m 755 config.guess %{buildroot}/usr/lib/rpm install -m 755 build-aux/config.guess %{buildroot}/usr/lib/rpm
install -m 755 config.sub %{buildroot}/usr/lib/rpm install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm
%endif %endif
rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
@ -428,7 +429,9 @@ fi
%doc doc/manual %doc doc/manual
%doc RPM-HOWTO %doc RPM-HOWTO
/etc/rpm /etc/rpm
%if !0%{?usrmerged}
/bin/rpm /bin/rpm
%endif
%{_bindir}/gendiff %{_bindir}/gendiff
%{_bindir}/rpm %{_bindir}/rpm
%{_bindir}/rpm2cpio %{_bindir}/rpm2cpio