Accepting request 1055735 from Base:System

Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1055108 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1055735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=72
This commit is contained in:
Dominique Leuenberger 2023-01-05 13:59:58 +00:00 committed by Git OBS Bridge
commit 981db7f25b
2 changed files with 8 additions and 3 deletions

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>

View File

@ -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