Accepting request 851062 from Kernel:kdump

OBS-URL: https://build.opensuse.org/request/show/851062
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=138

kexec-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 24 16:54:57 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Tue Nov 10 12:17:44 UTC 2020 - olaf@aepfle.de
 

kexec-tools.spec

@@ -90,10 +90,10 @@ install -m 0755 %{SOURCE1} %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_unitdir}
 install -m644 %{SOURCE3} %{buildroot}/%{_unitdir}
 ln -s service %{buildroot}%{_sbindir}/rckexec-load
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/sbin
 ln -s %{_sbindir}/kexec %{buildroot}/sbin
-#EndUsrMerge
+%endif
 
 %post
 %service_add_post kexec-load.service
@@ -128,9 +128,9 @@ ln -s %{_sbindir}/kexec %{buildroot}/sbin
 %license COPYING
 %doc AUTHORS News TODO doc
 %{_mandir}/man*/*
-#UsrMerge
+%if !0%{?usrmerged}
 /sbin/kexec
-#EndUsrMerge
+%endif
 %{_sbindir}/rckexec-load
 %{_sbindir}/kexec
 %{_sbindir}/kexec-bootloader