From d242ddc4b122c70c05899946644b8ee94c4de199861a5946b5f8a5459c9a8b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Thu, 26 Nov 2020 12:31:31 +0000
Subject: [PATCH] Accepting request 850972 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/850972
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=133
---
 kexec-tools.changes | 5 +++++
 kexec-tools.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/kexec-tools.changes b/kexec-tools.changes
index 6c805c5..23985e4 100644
--- a/kexec-tools.changes
+++ b/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
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 36a9d53..f0e6bfc 100644
--- a/kexec-tools.spec
+++ b/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