diff --git a/macros.kmp b/macros.kmp index fb4802e..09810ed 100644 --- a/macros.kmp +++ b/macros.kmp @@ -54,9 +54,10 @@ kernel_module_package_release 1 then \ preamble="%{-p*}" \ fi \ - if [ -z "%{kmodtool_generate_buildreqs}" ] \ + nobuildreqs="yes" \ + if [ "x%{kmodtool_generate_buildreqs}" != "x1" ] \ then \ - nobuildreqs="yes" \ + nobuildreqs="no" \ fi \ kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$nobuildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \ )} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index b9cf0c6..506ceee 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 65 +Version: 66 Release: 1%{?dist} # No version specified. License: GPL+ @@ -144,6 +144,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Jul 18 2017 Florian Festi - 66-1 +- Honor %%kmodtool_generate_buildreqs (#1472201) + * Thu Jul 13 2017 Igor Gnatenko - 65-1 - Add Requires: rust-srpm-macros for %%rust_arches