Provide ${kmodname}-devel-kmod for yum-builddep

In order to ensure that yum-builddep pulls in all the build
requirements a generic ${kmodname}-devel-kmod provides line is
added.  This allows a version of the development headers to be
included without requiring knowledge of the kernel version.

This is important because unlike rpmbuild which does correctly
expand the source rpm spec file, yum-builddep does not.  Without
this generic provides line mock which relies on yum-builddep is
unable to automatically satisfy the dependency.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/rpm/fedora/zfs-kmod.spec.in b/rpm/fedora/zfs-kmod.spec.in
index ac5f42a24242d5eced4ca4d540925db8f0de977a..323b99f4a0c4f2da2a987c9b2bbe41f5971888ca 100644 (file)
--- a/rpm/fedora/zfs-kmod.spec.in
+++ b/rpm/fedora/zfs-kmod.spec.in
@@ -30,8 +30,9 @@ ExcludeArch:    ppc ppc64
 Conflicts:      %{module}-dkms
 
 BuildRequires:  %{_bindir}/kmodtool
+BuildRequires:  spl-devel-kmod = %{version}-%{release}
 
-%global KmodsBuildRequires kmod-spl-devel
+%global KmodsBuildRequires spl-devel-kmod
 %global KmodsRequires      kmod-spl
 
 %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }

diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
index 8b2dcd1526785790dfc3224d93d1d806b421f097..d99446b217378691d8fecef9b654ba4627f46509 100644 (file)
--- a/rpm/generic/zfs-kmod.spec.in
+++ b/rpm/generic/zfs-kmod.spec.in
@@ -26,7 +26,8 @@ Conflicts:      %{module}-dkms
 %{?suse_version:BuildRequires: kernel-source}
 
 %if 0%{?rhel}%{?fedora}%{?suse_version}
-%global KmodsBuildRequires kmod-spl-devel
+BuildRequires:             spl-devel-kmod = %{version}-%{release}
+%global KmodsBuildRequires spl-devel-kmod
 %global KmodsRequires      kmod-spl
 %endif
 

diff --git a/scripts/kmodtool b/scripts/kmodtool
index 2170c4a908ae2b4b9d53a53cd07911c0371749b0..2fe014c7f08e6ab27296dd72128f6cce86cf4f31 100755 (executable)
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -243,7 +243,8 @@ print_rpmtemplate_per_kmoddevelpkg ()
 Summary:          ${kmodname} kernel module(s) devel for ${kernel_uname_r}
 Group:            System Environment/Kernel
 Requires:         ${kmodname}-devel-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:         kmod-${kmodname}-devel-uname-r = ${kernel_uname_r}
+Provides:         ${kmodname}-devel-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:         ${kmodname}-devel-kmod-uname-r = ${kernel_uname_r}
 EOF
 
        # second part