From 08529535f5c98efc26a54aa4b6bd28a272a303e81589de62fcc95650e3e91db8 Mon Sep 17 00:00:00 2001
From: Paulo Alcantara <palcantara@suse.com>
Date: Thu, 5 Jan 2023 15:41:44 +0000
Subject: [PATCH] Accepting request 1055756 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055756
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=202
---
 cifs-utils.changes | 5 +++++
 cifs-utils.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cifs-utils.changes b/cifs-utils.changes
index de06ac7..a031bae 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 10:32:54 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Mon Oct 17 13:29:37 UTC 2022 - palcantara@suse.de
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 5170e39..1bc18d3 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cifs-utils
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -137,7 +137,7 @@ done
 export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"
 export LDFLAGS="-pie"
 autoreconf -i
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 export ROOTSBINDIR="%{_sbindir}"
 %endif
 %configure \
@@ -187,7 +187,7 @@ if [ ! -f %{cifs_idmap_lib} ] ; then
 fi
 
 %files
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %{_sbindir}/mount.cifs
 %{_sbindir}/mount.smb3
 %else