diff --git a/kmod.changes b/kmod.changes index 74194ac..4d767a9 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 3 11:36:22 UTC 2020 - Michal Suchanek + +- Drop kmod-compat (boo#1173353). + ------------------------------------------------------------------- Wed May 27 23:31:52 UTC 2020 - Jan Engelhardt diff --git a/kmod.spec b/kmod.spec index d694016..984c4c6 100644 --- a/kmod.spec +++ b/kmod.spec @@ -45,7 +45,12 @@ BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) Requires(post): coreutils -Conflicts: kmod-compat < 25 +Obsoletes: kmod-compat < %version-%release +Provides: kmod-compat = %version-%release +Requires: suse-module-tools +Obsoletes: module-init-tools < 3.16 +Provides: module-init-tools = 3.16 +Provides: modutils %description kmod is a set of tools to handle common tasks with Linux kernel @@ -65,23 +70,6 @@ BuildArch: noarch %description bash-completion Contains bash completion support for kmod utilities. -%package compat -Summary: Compat symlinks for kernel module utilities -License: GPL-2.0-or-later -Group: System/Kernel -Requires: kmod = %version-%release -Requires: suse-module-tools -Obsoletes: module-init-tools < 3.16 -Provides: module-init-tools = 3.16 -Provides: modutils - -%description compat -kmod is a set of tools to handle common tasks with Linux kernel -modules like insert, remove, list, check properties, resolve -dependencies and aliases. - -This package contains traditional name symlinks (lsmod, etc.) - %package -n %lname Summary: Library to interact with Linux kernel modules License: LGPL-2.1-or-later @@ -157,6 +145,15 @@ done %_sbindir/modprobe %_sbindir/rmmod %_mandir/man[58]/*.[58]* +# The very very old paths (previously kmod-compat) +/bin/lsmod +/sbin/depmod +/sbin/insmod +/sbin/lsmod +/sbin/modinfo +/sbin/modprobe +/sbin/rmmod +# End kmod-compat %files bash-completion %defattr(-,root,root) @@ -172,16 +169,4 @@ done %_libdir/pkgconfig/libkmod.pc %_libdir/libkmod.so -%files compat -%defattr(-,root,root) -# The very very old paths (UsrMerge) -/bin/lsmod -/sbin/depmod -/sbin/insmod -/sbin/lsmod -/sbin/modinfo -/sbin/modprobe -/sbin/rmmod -# EndUsrMerge - %changelog