From 8ae1e2ac5fdb1110655cb0caad8028b56df6ee56cfcfeb949dfc653d59833d56 Mon Sep 17 00:00:00 2001
From: heming zhao <heming.zhao@suse.com>
Date: Thu, 5 Jan 2023 23:43:09 +0000
Subject: [PATCH] Accepting request 1055707 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055707
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=324
---
 lvm2.changes |  5 +++++
 lvm2.spec    | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lvm2.changes b/lvm2.changes
index d9df167..0b7a38f 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:08:23 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Nov  3 07:05:00 UTC 2022 - Amit Chaudhary <amit.chaudhary@suse.com>
 
diff --git a/lvm2.spec b/lvm2.spec
index 95b4978..ae53e97 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -272,7 +272,7 @@ sed -ie "s/%{upstream_device_mapper_version}/1.03.01/g" VERSION_DM
   rm %{buildroot}%{_unitdir}/lvmlocks.service
 
   # compat symlinks in /sbin remove with Leap 43
-  %if !0%{?usrmerged}
+  %if 0%{?suse_version} < 1550
   mkdir -p %{buildroot}/sbin
   ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup
   %endif
@@ -349,7 +349,7 @@ sed -ie "s/%{upstream_device_mapper_version}/1.03.01/g" VERSION_DM
     rm %{buildroot}%{_mandir}/man8/dmeventd.8
     rm %{buildroot}%{_mandir}/man8/dmfilemapd.8
 
-    %if !0%{?usrmerged}
+    %if 0%{?suse_version} < 1550
       # compat symlinks in /sbin remove with Leap 43
       mkdir -p %{buildroot}/sbin
       pushd %{buildroot}/%{_sbindir}
@@ -395,7 +395,7 @@ Programs and man pages for configuring and using the device mapper.
 %license COPYING COPYING.LIB
 %doc README
 %doc udev/12-dm-permissions.rules
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/dmsetup
 %endif
 %{_sbindir}/dmsetup
@@ -428,7 +428,7 @@ Device mapper main shared library
 %{_libdir}/libdevmapper.so.1.02
 
 %post   -n %{libname}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 # in usrmerged scenario we better don't remove ourselves :-)
 if [ -f /%{_lib}/libdevmapper.so.1.03 ]; then
   # Special migration - the library is now in %{_libdir}, but up to the point where
@@ -606,7 +606,7 @@ LVM commands use lvmlockd to coordinate access to shared storage.
 %{_sbindir}/rclvm2-lvmpolld
 %{_sbindir}/rclvm2-monitor
 # compat symlinks in /sbin
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/lvm
 /sbin/lvmconfig
 /sbin/lvmdevices