From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 8 Apr 2011 17:20:08 +0000 (-0700)
Subject: Fix rebuildable RPMs for el6/ch5
X-Git-Tag: spl-0.6.0-rc3^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96cdefab84061e807f54ed17b93e0586393f9448;p=spl

Fix rebuildable RPMs for el6/ch5

When rebuilding the source RPM under el5 you need to append the
target_cpu.  However, under el6/ch5 things are packaged correctly
and the arch is already part of kver.  For this reason it also
needs to be stripped from kver when setting kverpkg.
---

diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index 76dcfa6..e02d6c2 100644
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -94,14 +94,18 @@
  %endif
  %define kpkg            kernel
  %define kdevpkg         kernel-devel
- %if %{defined el6}
+ %if %{defined el6} || %{defined ch5}
   %define kverpkg        %(echo %{kver} | %{__sed} -e 's/.%{_target_cpu}//g')
  %else
   %define kverpkg        %{kver}
  %endif
  %define koppkg          =
  %if %{undefined kdir}
-  %define kdir           %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+  %if %{defined el6} || %{defined ch5}
+   %define kdir           %{_usrsrc}/kernels/%{kver}
+  %else
+   %define kdir           %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+  %endif
  %endif
  %if %{undefined kobj}
   %define kobj           %{kdir}