Fix configure tests to play nice with GCC 4.6

[zfs.git] / zfs-modules.spec.in

diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in
index 93129b3..c1c1356 100644 (file)
--- a/zfs-modules.spec.in
+++ b/zfs-modules.spec.in
@@ -66,8 +66,8 @@
  %endif
 %else
 
-# CHAOS 4.x/5.x:
-%if %{defined ch4} || %{defined ch5}
+# CHAOS 4.x:
+%if %{defined ch4}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
   %define kver           %((echo X; %{__cat} %{klnk}/kernel.release
@@ -85,8 +85,8 @@
  %endif
 %else
 
-# RHEL 5.x/6.x:
-%if %{defined el5} || %{defined el6}
+# RHEL 5.x/6.x, CHAOS 5.x:
+%if %{defined el5} || %{defined el6} || %{defined ch5}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
   %define kver           %((echo X; %{__cat} %{klnk}/kernel.release
@@ -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}
@@ -175,7 +179,7 @@
  %define spldir %{_usrsrc}/spl-%{splver}/%{kver}
 %endif
 %if %{undefined splobj}
- %define splobj          %{spldir}/module
+ %define splobj          %{spldir}
 %endif
 
 
@@ -207,9 +211,9 @@ Summary:         ZFS File System
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
-Release:         %{release}
-License:         @LICENSE@
-URL:             git://eris.llnl.gov/zfs.git
+Release:         %{release}%{?dist}
+License:         @ZFS_META_LICENSE@
+URL:             git://github.com/zfsonlinux/zfs.git
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
 Source:          @PACKAGE@-%{version}.tar.gz
 %if %{defined krequires}
@@ -220,6 +224,7 @@ BuildRequires:   %{kdevpkg}
 %endif
 Requires:        %{splrequires}
 BuildRequires:   %{spldevpkg}
+Provides:        lustre-backend-fs
 
 %description
 The %{name} package contains kernel modules and support utilities for
@@ -267,14 +272,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ -f /boot/System.map-%{kver} ]; then
-       depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
+       /sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
 else
-       depmod -ae %{kver} || exit 0
+       /sbin/depmod -a || exit 0
 fi
 
 %postun
 if [ -f /boot/System.map-%{kver} ]; then
-       depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
+       /sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
 else
-       depmod -ae %{kver} || exit 0
+       /sbin/depmod -a || exit 0
 fi