Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2020-11-23 16:39:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod" Mon Nov 23 16:39:02 2020 rev:57 rq:849634 version:27 Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2020-11-09 13:58:19.567844408 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new.5913/kmod.changes 2020-11-23 18:47:51.817206256 +0100 @@ -6,0 +7,5 @@ +Fri Oct 16 10:00:21 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.fdcmGL/_old 2020-11-23 18:47:52.573207043 +0100 +++ /var/tmp/diff_new_pack.fdcmGL/_new 2020-11-23 18:47:52.577207047 +0100 @@ -117,12 +117,16 @@ 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 @@ %_sbindir/modprobe %_sbindir/rmmod %_mandir/man[58]/*.[58]* +%if !0%{?usrmerged} /bin/lsmod /sbin/depmod /sbin/insmod @@ -151,6 +156,7 @@ /sbin/modinfo /sbin/modprobe /sbin/rmmod +%endif %files bash-completion %_datadir/bash-completion/ _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org