From 666886db7be3af627234368dd5931aaa0b10b120b94b87f3b55e9d743e8a46d6 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.com>
Date: Tue, 17 Jan 2023 10:40:53 +0000
Subject: [PATCH] Accepting request 1052797 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1052797
OBS-URL: https://build.opensuse.org/package/show/hardware/crda?expand=0&rev=40
---
 crda.changes | 5 +++++
 crda.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crda.changes b/crda.changes
index c624d8d..85845ff 100644
--- a/crda.changes
+++ b/crda.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:29:57 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Tue Dec  1 14:56:43 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/crda.spec b/crda.spec
index 5b93e55..72c1302 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package crda
 #
-# Copyright (c) 2020 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
@@ -73,7 +73,7 @@ export PATH=.:$PATH
 make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install
 mkdir -p %{buildroot}%{_prefix}%{_sysconfdir}/default
 install -m 644 %{S:1} %{buildroot}%{_prefix}%{_sysconfdir}/default/%{name}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir $RPM_BUILD_ROOT/sbin
 ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
 %endif
@@ -86,7 +86,7 @@ rm -r %{buildroot}/usr/include/reglib
 %_sbindir/crda
 %_sbindir/regdbdump
 %_libdir/libreg.so
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/crda
 /sbin/regdbdump
 %endif