From 98f3e148e0639dfe3e4e3cd5204a0580089eb1f22b005399bedd370ac121cce1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 20 Nov 2020 10:52:59 +0000
Subject: [PATCH] Accepting request 849624 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/kmod.changes b/kmod.changes
index 29116c8..a61f6e9 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -3,6 +3,11 @@ Fri Nov  6 11:41:50 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
 - Add usr-lib-modprobe.patch [boo#1092648]
 
+-------------------------------------------------------------------
+Fri Oct 16 10:00:21 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Tue Jul  7 13:05:53 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/kmod.spec b/kmod.spec
index 4dbfbe6..9992733 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -117,12 +117,16 @@ 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}
 	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}
 	ln -s "%_bindir/kmod" "$b/bin/$i"
+%endif
 done
 
 %post
@@ -144,6 +148,7 @@ done
 %_sbindir/modprobe
 %_sbindir/rmmod
 %_mandir/man[58]/*.[58]*
+%if !0%{?usrmerged}
 /bin/lsmod
 /sbin/depmod
 /sbin/insmod
@@ -151,6 +156,7 @@ done
 /sbin/modinfo
 /sbin/modprobe
 /sbin/rmmod
+%endif
 
 %files bash-completion
 %_datadir/bash-completion/