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 + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Thu Jun 30 16:15:35 UTC 2022 - Jan Engelhardt 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