From dc6c66a011a4d45601c61f85e3e28cbbac477fec33dd55ed329d1908bd1d0b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Sat, 7 Jan 2023 22:19:45 +0000
Subject: [PATCH] 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
---
 kexec-tools.changes | 5 +++++
 kexec-tools.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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 <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>
 
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