]> git.proxmox.com Git - mirror_zfs.git/commitdiff
kmod-zfs should obsolete kmod-spl as well as spl-kmod
authorOlaf Faaland <faaland1@llnl.gov>
Sun, 11 Apr 2021 19:02:26 +0000 (12:02 -0700)
committerGitHub <noreply@github.com>
Sun, 11 Apr 2021 19:02:26 +0000 (12:02 -0700)
Without this Obsoletes, using packages built --with-spec=redhat, an
upgrade from zfs-0.7 to zfs-2.x does not cause the kmod-spl-0.7 package
to be removed.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Closes #11865

rpm/redhat/zfs-kmod.spec.in

index eb626e3f4a842e084d4d648a435153b508603c94..eb93aeeb2efe11a3e489b6436ec3dba2e4e1abc3 100644 (file)
@@ -18,6 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %(/bin/echo -e "\
 Requires:       @PACKAGE@ = %{version}\n\
 Conflicts:      @PACKAGE@-dkms\n\
+Obsoletes:      kmod-spl\n\
 Obsoletes:      spl-kmod\n\n" > %{_sourcedir}/kmod-preamble)
 
 # LDFLAGS are not sanitized by arch/*/Makefile for these architectures.