From 33cf9b66ca40e8c277d4d69d0f3efb33555c3292988ad9e105a6b6223f75bec2 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Mon, 23 Nov 2020 18:13:06 +0000
Subject: [PATCH] Accepting request 849582 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/crda.changes b/crda.changes
index 4b2528f..0af6997 100644
--- a/crda.changes
+++ b/crda.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:43:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Aug 17 17:34:41 CEST 2020 - ro@suse.de
 
diff --git a/crda.spec b/crda.spec
index cec726f..0f687d3 100644
--- a/crda.spec
+++ b/crda.spec
@@ -67,10 +67,10 @@ make all_noverify %{?_smp_mflags} V=1
 # to find ldconfig...
 export PATH=.:$PATH
 make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir $RPM_BUILD_ROOT/sbin
 ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
-#EndUserMerge
+%endif
 
 # clean up unneeded stuff...
 rm -r %{buildroot}/usr/include/reglib
@@ -80,10 +80,10 @@ rm -r %{buildroot}/usr/include/reglib
 %_sbindir/crda
 %_sbindir/regdbdump
 %_libdir/libreg.so
-#UsrMerge
+%if !0%{?usrmerged}
 /sbin/crda
 /sbin/regdbdump
-#EndUserMerge
+%endif
 %{_udevrulesdir}/85-regulatory.rules
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz