From ccb6092caacaa05bf04438e3baf55b5c1a45fa3de5ff64fb87e73740e5136fae Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 4 Jan 2023 12:19:04 +0000
Subject: [PATCH] Accepting request 1055754 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055754
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=40
---
 xfsdump.changes | 5 +++++
 xfsdump.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xfsdump.changes b/xfsdump.changes
index 04f3435..29a598e 100644
--- a/xfsdump.changes
+++ b/xfsdump.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:25:59 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Sat Dec 17 18:23:54 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/xfsdump.spec b/xfsdump.spec
index 2b431d7..ead2939 100644
--- a/xfsdump.spec
+++ b/xfsdump.spec
@@ -71,7 +71,7 @@ export DIST_ROOT=%{buildroot}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %find_lang xfsdump
 mv %{buildroot}/sbin/{xfsdump,xfsrestore} %{buildroot}/%{_sbindir}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 ln -s %{_sbindir}/xfsdump %{buildroot}/sbin
 ln -s %{_sbindir}/xfsrestore %{buildroot}/sbin
 %endif
@@ -79,7 +79,7 @@ ln -s %{_sbindir}/xfsrestore %{buildroot}/sbin
 %files -f xfsdump.lang
 %defattr(-,root,root,755)
 %{_sbindir}/*
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/*
 %endif
 %doc %{_defaultdocdir}/%{name}