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/zfs-modules.spec.in b/zfs-modules.spec.in
index 8d96696a29f4fb6996c99bfcbfcaa217325dd671..84d1d528060fefee0d62d73f551a523cad2db4df 100644 (file)
--- a/zfs-modules.spec.in
+++ b/zfs-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}