From d0802cd14f9de3c8e0de565a61e63ae33cb573bdb3c38155ca49143b9c61b64e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2023 11:09:43 +0000
Subject: [PATCH] Accepting request 1055108 from home:lnussel:usrmerge

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

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

diff --git a/kmod.changes b/kmod.changes
index bcfaf01..14e3ceb 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 12:38:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Jun 30 16:15:35 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/kmod.spec b/kmod.spec
index 3711385..4ee4fb5 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -140,14 +140,14 @@ rm -f "$b/%_libdir"/*.la
 mkdir -p "$b/%_sbindir" "$b/sbin"
 for i in depmod insmod lsmod modinfo modprobe rmmod; do
 	ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 	ln -s "%_bindir/kmod" "$b/sbin/$i"
 %endif
 done
 mkdir -p "$b/%_bindir" "$b/bin"
 for i in lsmod; do
 	ln -s "%_bindir/kmod" "$b/%_bindir/$i"
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 	ln -s "%_bindir/kmod" "$b/bin/$i"
 %endif
 done
@@ -171,7 +171,7 @@ done
 %_sbindir/modprobe
 %_sbindir/rmmod
 %_mandir/man[58]/*.[58]*
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/lsmod
 /sbin/depmod
 /sbin/insmod