Merge branch 'master' into epel8

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}

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 <sergio@serjux.com> - 1-37
+- Fix package name in epel scriptlets
+
 * Thu Oct 10 2019 Leigh Scott <leigh123linux@gmail.com> - 1-36
 - Fix naming conflict with kmod meta package