testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 868668 from home:lnussel:usrmove

Browse Source 
- 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
This commit is contained in:
Michael Schröder 2021-02-09 09:39:40 +00:00 committed by Git OBS Bridge
parent ccb622e0c5
commit 1c82082ae6
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpm.changes
View File

@ -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] - 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>

4
rpm.spec
View File

@ -307,7 +307,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
@ -428,7 +430,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