X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=zfs-modules.spec.in;h=4c13adf635f9d2f84591fa989814fa9f7b8f71da;hb=30930fba219642cb1dadf1c8ef60ff799e3dc424;hp=8d96696a29f4fb6996c99bfcbfcaa217325dd671;hpb=34e4864009d32da5fe29393082a56b5272f65faa;p=zfs.git diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in index 8d96696..4c13adf 100644 --- 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} @@ -194,13 +198,15 @@ %define krequires %{kpkg} %endif %define splrequires %{splpkg} +%define spldevrequires %{spldevpkg} %else %define relext %(echo %{kverpkg} | %{__sed} -e 's/-/_/g') %define release @ZFS_META_RELEASE@_%{relext} %if %{defined kpkg} %define krequires %{kpkg} %{koppkg} %{kverpkg} %endif -%define splrequires %{splpkg} = %{splverpkg} +%define splrequires %{splpkg} = %{splverpkg}_%{relext} +%define spldevrequires %{spldevpkg} = %{splverpkg}_%{relext} %endif Summary: ZFS File System @@ -208,8 +214,8 @@ Group: Utilities/System Name: %{name} Version: %{version} Release: %{release} -License: @LICENSE@ -URL: git://eris.llnl.gov/zfs.git +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 +226,7 @@ BuildRequires: %{kdevpkg} %endif Requires: %{splrequires} BuildRequires: %{spldevpkg} +Provides: lustre-backend-fs %description The %{name} package contains kernel modules and support utilities for @@ -231,11 +238,10 @@ Group: Development/Libraries %if %{defined krequires} Requires: %{krequires} %endif -Requires: %{splrequires} %if %{defined kdevpkg} -BuildRequires: %{kdevpkg} +Requires: %{kdevpkg} %endif -BuildRequires: %{spldevpkg} +Requires: %{spldevrequires} %description devel The %{name}-devel package contains the kernel header files and @@ -267,14 +273,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