From 2ec0b0dd71b7dfb61ebcd14ab69ad3413fff4dbb Mon Sep 17 00:00:00 2001 From: Olaf Faaland Date: Sun, 11 Apr 2021 12:02:26 -0700 Subject: [PATCH] kmod-zfs should obsolete kmod-spl as well as spl-kmod 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 Signed-off-by: Olaf Faaland Closes #11865 --- rpm/redhat/zfs-kmod.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in index eb626e3f4a..eb93aeeb2e 100644 --- a/rpm/redhat/zfs-kmod.spec.in +++ b/rpm/redhat/zfs-kmod.spec.in @@ -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.