Spec file update, for some reason the following shorthand syntax

was failing so it was replaced with the longer %if version.

%{!?foo: %define foo bar}

changed to

%if %{undefined foo}
 %define foo bar
%endif

diff --git a/spl.spec.in b/spl.spec.in
index 3922f938b52da08b0367f95b2cf73de8917bd082..408158fc2f3d712ff6bba3e58831fc93e38d04e3 100644 (file)
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -18,49 +18,70 @@
 %if %{defined sles_version}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/linux-obj/%{_target_cpu}/%{_target_cpu}
-  %define kver           %((echo unknown; %{__cat} %{klnk}/.kernelrelease 2>/dev/null) | tail -1)
- %endif                
+  %define kver           %((echo unknown; %{__cat} %{klnk}/.kernelrelease 
+                            2>/dev/null) | tail -1)
+ %endif
  %define kpkg            kernel-%{_target_cpu}
  %define kdevpkg         kernel-source kernel-syms
  %define kverpkg         %(echo %{kver} | cut -d'-' -f1-2)
- %{!?kdir: %define kdir  %{_usrsrc}/linux-%{kverpkg}}
- %{!?kobj: %define kobj  %{kdir}-obj/%{_target_cpu}/%{_target_cpu}}
+ %if %{undefined kdir}
+  %define kdir           %{_usrsrc}/linux-%{kverpkg}
+ %endif
+ %if %{undefined kobj}
+  %define kobj           %{kdir}-obj/%{_target_cpu}/%{_target_cpu}
+ %endif
 
 # CHAOS4:
 %else
 %if %{defined ch4}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
-  %define kver           %((echo unknown; %{__cat} %{klnk}/kernel.release 2>/dev/null) | tail -1)
- %endif                
+  %define kver           %((echo unknown; %{__cat} %{klnk}/kernel.release
+                            2>/dev/null) | tail -1)
+ %endif
  %define kpkg            chaos-kernel
  %define kdevpkg         chaos-kernel-devel
  %define kverpkg         %{kver}
- %{!?kdir: %define kdir  %{_usrsrc}/kernels/%{kver}}
- %{!?kobj: %define kobj  %{kdir}}
+ %if %{undefined kdir}
+  %define kdir %{_usrsrc}/kernels/%{kver}
+ %endif
+ %if %{undefined kobj}
+  %define kobj           %{kdir}
+ %endif
 
 # RHEL*/Fedora:
 %else
 %if %{defined fedora} || %{defined rhel}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
-  %define kver           %((echo unknown; %{__cat} %{klnk}/kernel.release 2>/dev/null) | tail -1)
+  %define kver           %((echo unknown; %{__cat} %{klnk}/kernel.release
+                            2>/dev/null) | tail -1)
  %endif
  %define kpkg            kernel
  %define kdevpkg         kernel-devel
  %define kverpkg         %(echo %{kver} | cut -d'.' -f1-7)
- %{!?kdir: %define kdir  %{_usrsrc}/kernels/%{kver}}
- %{!?kobj: %define kobj  %{kdir}}
+ %if %{undefined kdir}
+  %define kdir           %{_usrsrc}/kernels/%{kver}
+ %endif
+ %if %{undefined kobj}
+  %define kobj           %{kdir}
+ %endif
 
 %else
 
 # Unsupported distro:
-%{!?kver: %define kver   unknown}
-%define kpkg             kernel
-%define kdevpkg          kernel-devel
-%define kverpkg          %{kver}
-%{!?kdir: %define kdir   %{_usrsrc}/kernels/%{kver}}
-%{!?kobj: %define kobj   %{kdir}}
+ %if %{undefined kver}
+  %define kver            unknown
+ %endif
+ %define kpkg             kernel
+ %define kdevpkg          kernel-devel
+ %define kverpkg          %{kver}
+ %if %{undefined kdir}
+  %define kdir           %{_usrsrc}/kernels/%{kver}
+ %endif
+ %if %{undefined kobj}
+  %define kobj           %{kdir}
+ %endif
 
 %endif
 %endif