diff --git a/kexec-tools.changes b/kexec-tools.changes index b28677f..a156ad6 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:37:09 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue Oct 4 19:05:14 UTC 2022 - Dirk Müller diff --git a/kexec-tools.spec b/kexec-tools.spec index 1f351db..b39dc3f 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -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