From cd6c688c452c66ef8ca8e15fe32288562a486737 Mon Sep 17 00:00:00 2001
From: heming zhao <heming.zhao@suse.com>
Date: Mon, 24 Oct 2022 11:16:46 +0000
Subject: [PATCH] Accepting request 1030854 from
 home:hmzhao:branches:network:ha-clustering:Factory

- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
  + modify ocfs2_tools.spec to use %suse_version to replace %UsrMerge

OBS-URL: https://build.opensuse.org/request/show/1030854
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=148
---
 ocfs2-tools.changes | 6 ++++++
 ocfs2-tools.spec    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 51d8342..70d70b6 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 24 10:06:00 UTC 2022 - heming.zhao@suse.com
+
+- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
+  + modify ocfs2_tools.spec to use %suse_version to replace %UsrMerge
+
 -------------------------------------------------------------------
 Sat Oct 22 08:40:00 UTC 2022 - heming.zhao@suse.com
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index dc4fbf0..ccb710c 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -22,7 +22,7 @@
 %endif
 
 #see bsc#1191084
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
   # for SLEs
   %define sbindir /sbin
 %else
@@ -194,7 +194,7 @@ autoreconf -fi -I /usr/share/aclocal
   %endif
   --enable-dynamic-fsck=yes \
   --enable-dynamic-ctl=yes \
-  %if !0%{?usrmerged}
+  %if 0%{?suse_version} < 1550
   # "do nothing"
   %else
   --with-root-prefix=/usr
@@ -235,7 +235,7 @@ cd reflink
 make DESTDIR="%{buildroot}" install
 cd ..
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mv %{buildroot}/{,/usr}/sbin/o2image
 mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
 #mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk