jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Accepting request 1055108 from home:lnussel:usrmerge

Browse Source 
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
This commit is contained in:
Jan Engelhardt 2023-01-04 11:09:43 +00:00 committed by Git OBS Bridge
parent 9b78da23c3
commit d0802cd14f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kmod.changes
View File

@ -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> Thu Jun 30 16:15:35 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

6
kmod.spec
View File

@ -140,14 +140,14 @@ rm -f "$b/%_libdir"/*.la
mkdir -p "$b/%_sbindir" "$b/sbin" mkdir -p "$b/%_sbindir" "$b/sbin"
for i in depmod insmod lsmod modinfo modprobe rmmod; do for i in depmod insmod lsmod modinfo modprobe rmmod; do
ln -s "%_bindir/kmod" "$b/%_sbindir/$i" ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
ln -s "%_bindir/kmod" "$b/sbin/$i" ln -s "%_bindir/kmod" "$b/sbin/$i"
%endif %endif
done done
mkdir -p "$b/%_bindir" "$b/bin" mkdir -p "$b/%_bindir" "$b/bin"
for i in lsmod; do for i in lsmod; do
ln -s "%_bindir/kmod" "$b/%_bindir/$i" ln -s "%_bindir/kmod" "$b/%_bindir/$i"
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
ln -s "%_bindir/kmod" "$b/bin/$i" ln -s "%_bindir/kmod" "$b/bin/$i"
%endif %endif
done done
@ -171,7 +171,7 @@ done
%_sbindir/modprobe %_sbindir/modprobe
%_sbindir/rmmod %_sbindir/rmmod
%_mandir/man[58]/*.[58]* %_mandir/man[58]/*.[58]*
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/lsmod /bin/lsmod
/sbin/depmod /sbin/depmod
/sbin/insmod /sbin/insmod