Accepting request 1055731 from home:lnussel:usrmerge
Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1055731 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=631
This commit is contained in:
parent
4bcfde392f
commit
5d70ada42a
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 27 13:17:31 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
|
||||||
|
|
||||||
|
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
4
rpm.spec
4
rpm.spec
@ -275,7 +275,7 @@ 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}
|
%if 0%{?suse_version} < 1550
|
||||||
ln -s /usr/bin/rpm %{buildroot}/bin/rpm
|
ln -s /usr/bin/rpm %{buildroot}/bin/rpm
|
||||||
%endif
|
%endif
|
||||||
# remove .la file and the static variant of libpopt
|
# remove .la file and the static variant of libpopt
|
||||||
@ -391,7 +391,7 @@ fi
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%doc docs/manual
|
%doc docs/manual
|
||||||
/etc/rpm
|
/etc/rpm
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
/bin/rpm
|
/bin/rpm
|
||||||
%endif
|
%endif
|
||||||
%{_bindir}/gendiff
|
%{_bindir}/gendiff
|
||||||
|
Loading…
Reference in New Issue
Block a user