Accepting request 1055027 from home:lnussel:usrmerge

- Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055027
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=149
This commit is contained in:
Petr Tesařík 2023-01-07 22:19:45 +00:00 committed by Git OBS Bridge
parent 2f0db0bb4d
commit dc6c66a011
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:37:09 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Tue Oct 4 19:05:14 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -76,7 +76,7 @@ install -m 0755 %{SOURCE1} %{buildroot}/%{_sbindir}
mkdir -p %{buildroot}/%{_unitdir}
install -m644 %{SOURCE3} %{buildroot}/%{_unitdir}
ln -s service %{buildroot}%{_sbindir}/rckexec-load
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/sbin
ln -s %{_sbindir}/kexec %{buildroot}/sbin
%endif
@ -114,7 +114,7 @@ ln -s %{_sbindir}/kexec %{buildroot}/sbin
%license COPYING
%doc AUTHORS News TODO doc
%{_mandir}/man*/*
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/kexec
%endif
%{_sbindir}/rckexec-load