From 7fb029c7511fede45ebf46c149585c69d31b1ba451aaf5e32875a1dcabebedef Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2023 11:41:01 +0000
Subject: [PATCH] Accepting request 1055750 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055750
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=481
---
 util-linux.changes | 5 +++++
 util-linux.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/util-linux.changes b/util-linux.changes
index 33983b0..4949e7c 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:23:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Dec 21 17:11:27 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/util-linux.spec b/util-linux.spec
index 8b646bc..f0e049a 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -40,7 +40,7 @@
 %define ulbuild python
 %endif
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 %define ul_extra_bin_sbin 1
 %else
 %define ul_extra_bin_sbin 0