diff --git a/kmod.attr b/kmod.attr deleted file mode 100644 index 44a8d56..0000000 --- a/kmod.attr +++ /dev/null @@ -1,21 +0,0 @@ -%__kmod_path ^/lib/modules/.*/(modules.builtin|.*ko) -%__kmod_provides() %{lua: - function basename(fn) - return string.gsub(fn, "(.*/)(.*)", "%2") - end - function printdep(mod) - print("kmod("..mod..")") - end - local fn = rpm.expand("%{1}") - local bn = basename(fn) - if bn == "modules.builtin" then - for l in io.lines(fn) do - printdep(basename(l)) - end - else - local mod = string.match(bn, "%g+.ko") - if mod then - printdep(mod) - end - end -} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 40e99a1..9909ce7 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -69,7 +69,6 @@ Source500: config.guess Source501: config.sub # Dependency generators & their rules -Source600: kmod.attr Source602: libsymlink.attr # BRPs @@ -91,7 +90,8 @@ Requires: efi-srpm-macros Requires: fonts-srpm-macros Requires: ghc-srpm-macros Requires: go-srpm-macros -Requires: kernel-srpm-macros +# ↓ Provides kmod.attr originally shipped by us +Requires: kernel-srpm-macros >= 1.0-6 Requires: lua-srpm-macros Requires: ocaml-srpm-macros Requires: openblas-srpm-macros @@ -190,7 +190,7 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %changelog * Wed May 12 2021 Michal Domonkos - 185-1 -- Drop kernel-rpm-macros subpackage +- Drop kernel-rpm-macros subpackage & kmod.attr - Resolves: #1959924 * Wed Apr 21 2021 Michal Domonkos - 184-1