From 29ba9626e00708e83e85c2d6fff764fe1db45cb1ca176986dd86aa7db58ba3d7 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Thu, 5 Jan 2023 06:25:12 +0000
Subject: [PATCH] Accepting request 1053546 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1053546
OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=80
---
 dosfstools.changes | 5 +++++
 dosfstools.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dosfstools.changes b/dosfstools.changes
index eeeb22c..d6a47de 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:33:50 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Feb  3 12:54:11 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/dosfstools.spec b/dosfstools.spec
index 5712f49..4a90598 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dosfstools
 #
-# 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
@@ -48,7 +48,7 @@ floppies.
 
 %install
 %make_install
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir %{buildroot}/sbin
 ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin
 %endif
@@ -58,7 +58,7 @@ ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fs
 
 %files
 %doc %{_docdir}/dosfstools
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/*
 %endif
 %{_sbindir}/dosfsck