From 26e909573cdaa8578569ab8f47c234b9ae838c61 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 11 Oct 2019 16:11:49 +0100 Subject: [PATCH 1/2] Fix package name in epel scriptlets --- kmodtool-kmodtool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool index b633615..9263631 100644 --- a/kmodtool-kmodtool +++ b/kmodtool-kmodtool @@ -224,7 +224,7 @@ modules=( \$(find ${usr_lib_modules}/${kernel_uname_r}/extra/${kmodname}/ | grep printf '%s\n' "\${modules[@]}" | %{?_prefix_usr}/sbin/weak-modules --add-modules %preun -n kmod-${kmodname}-${kernel_uname_r} -rpm -ql kmod-${kmodname}-%{version}-%{release}.$(arch) | grep -e '\.ko$' > /var/run/rpm-kmod-${kmodname}-modules +rpm -ql kmod-${kmodname}-${kernel_uname_r}-%{version}-%{release}.$(arch) | grep -e '\.ko$' > /var/run/rpm-kmod-${kmodname}-modules %postun -n kmod-${kmodname}-${kernel_uname_r} %{_kmodtool_depmod_post} @@ -256,7 +256,7 @@ fi %preun -n kmod-${kmodname}-${kernel_uname_r} if [[ "\$(uname -r)" == "${kernel_uname_r}" ]] ; then - rpm -ql kmod-${kmodname}-%{version}-%{release}.$(arch) | grep -e '\.ko$' > /var/run/rpm-kmod-${kmodname}-modules + rpm -ql kmod-${kmodname}-${kernel_uname_r}-%{version}-%{release}.$(arch) | grep -e '\.ko$' > /var/run/rpm-kmod-${kmodname}-modules fi %postun -n kmod-${kmodname}-${kernel_uname_r} From e9f8c73d7e93e4fea7f40dc38e8c10a2e0f7985d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 13 Oct 2019 16:39:19 +0100 Subject: [PATCH 2/2] Fix package name in epel scriptlets --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index b85e5a0..12b6a0a 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -1,6 +1,6 @@ Name: kmodtool Version: 1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -40,6 +40,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ %changelog +* Sun Oct 13 2019 Sérgio Basto - 1-37 +- Fix package name in epel scriptlets + * Thu Oct 10 2019 Leigh Scott - 1-36 - Fix naming conflict with kmod meta package