Simplify the kernel depenency logic

diff --git a/spl.spec.in b/spl.spec.in
index 408158fc2f3d712ff6bba3e58831fc93e38d04e3..0243dc4300db4f005fa03d46ae60e6ddc536fbde 100644 (file)
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -88,28 +88,23 @@
 %endif
 
 # Distro agnostic:
-%define debug_package %{nil}
-
-%define name     @PACKAGE@
-%define version  @VERSION@
-
-# The kernel version should only be appended to a binary RPM.
-# When building a source RPM it must be kernel version agnostic.
+%define name             @PACKAGE@
+%define version          @VERSION@
+%define debug_package    %{nil}
+
+# The kernel version should only be appended to a binary RPM.  When
+# building a source RPM it must be kernel version agnostic.  This means
+# the source RPM must never specify a required kernel version, but the
+# final RPM should be keyed to the kernel version it was built against.
 %if %{defined build_src_rpm}
-%define release  @SPL_META_RELEASE@
-%else
-%define release  @SPL_META_RELEASE@_%(echo %{kverpkg} | %{__sed} -e 's/-/_/g')
-%endif
-
-# Required by mock to ensure valid 'Requires' and 'BuildRequires' fields
-# are set even when a specific kernel version was not requested.  This is
-# used when mock is attempting to rebuild the srpm for the latest kernel.
-%if %{defined require_kver}
-%define requires      %{kpkg}=%{kverpkg}
-%define buildrequires %{kdevpkg}=%{kverpkg}
+%define release          @SPL_META_RELEASE@
+%define requires         %{kpkg}
+%define buildrequires    %{kdevpkg}
 %else
-%define requires      %{kpkg}
-%define buildrequires %{kdevpkg}
+%define release          @SPL_META_RELEASE@_%(echo %{kverpkg} |
+                                              %{__sed} -e 's/-/_/g')
+%define requires         %{kpkg} = %{kverpkg}
+%define buildrequires    %{kdevpkg} = %{kverpkg}
 %endif
 
 Summary:         Solaris Porting Layer