From d404dd1dada72214e33eeaa67edc8dd96c36c05c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 10:08:29 -0700 Subject: [PATCH] Minor spec file cleanup for srpm case. Ensure kpkg is defined is srpm case before using it to define the krequires macro. Interestingly this is not an issue for rpm-4.7.1-4 but it is for rpm-4.4.2.3-18. --- zfs-modules.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in index 836813ae5e..c08b59fd4f 100644 --- a/zfs-modules.spec.in +++ b/zfs-modules.spec.in @@ -22,7 +22,7 @@ %define kobj %{require_kobj} %endif -# SLES 10, SLES 11: +# SLES: %if %{defined suse_version} %if %{undefined kver} %ifarch ppc64 @@ -104,7 +104,7 @@ %endif %else -# Fedora 11: +# Fedora: %if %{defined fedora} %if %{undefined kver} %define klnk %{_usrsrc}/kernels/*/include/config @@ -186,7 +186,9 @@ # final RPM should be keyed to the kernel version it was built against. %if %{defined build_src_rpm} %define release @ZFS_META_RELEASE@ +%if %{defined kpkg} %define krequires %{kpkg} +%endif %define splrequires %{splpkg} %else %define relext %(echo %{kverpkg} | %{__sed} -e 's/-/_/g')