diff options
Diffstat (limited to 'rpm/redhat')
| -rw-r--r-- | rpm/redhat/zfs-kmod.spec.in | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in index f43adba76..28a648418 100644 --- a/rpm/redhat/zfs-kmod.spec.in +++ b/rpm/redhat/zfs-kmod.spec.in @@ -10,16 +10,15 @@ Group: System Environment/Kernel License: @ZFS_META_LICENSE@ URL: http://zfsonlinux.org/ BuildRequires: %kernel_module_package_buildreqs -BuildRequires: kmod-spl-devel = %{version} Source0: @PACKAGE@-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Additional dependency information for the kmod sub-package must be specified # by generating a preamble text file which kmodtool can append to the spec file. %(/bin/echo -e "\ -Requires: spl-kmod\n\ Requires: @PACKAGE@ = %{version}\n\ -Conflicts: @PACKAGE@-dkms\n\n" > %{_sourcedir}/kmod-preamble) +Conflicts: @PACKAGE@-dkms\n\n" > %{_sourcedir}/kmod-preamble\n\ +Obsoletes: spl-kmod) # LDFLAGS are not sanitized by arch/*/Makefile for these architectures. %ifarch ppc ppc64 ppc64le aarch64 @@ -35,17 +34,13 @@ This package contains the ZFS kernel modules. %define ksrc %{_usrsrc}/kernels/%{kverrel} %define kobj %{ksrc} -%define splsrc %{_usrsrc}/spl-%{version} -%define splobj %{splsrc}/%{kverrel} %package -n kmod-%{kmod_name}-devel Summary: ZFS kernel module(s) devel common Group: System Environment/Kernel -Requires: kmod-spl-devel = %{version} %description -n kmod-%{kmod_name}-devel -This package provides the header files and objects to build kernel modules -which depend on the spl kernel module. +This package provides the header files and objects to build kernel modules. %prep if ! [ -d "%{ksrc}" ]; then @@ -71,8 +66,6 @@ fi --with-config=kernel \ --with-linux=%{ksrc} \ --with-linux-obj=%{kobj} \ - --with-spl="%{splsrc}" \ - --with-spl-obj="%{splobj}" \ %{debug} \ %{debuginfo} make %{?_smp_mflags} @@ -91,3 +84,4 @@ rm -rf $RPM_BUILD_ROOT %files -n kmod-%{kmod_name}-devel %{_usrsrc}/%{kmod_name}-%{version} +%{_usrsrc}/spl-%{version} |