From 677ca1e825af80f60569f84803304ccf0092728b Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Mon, 11 Jul 2022 11:35:01 -0700 Subject: [PATCH] rpm: Silence "unversioned Obsoletes" warnings on EL 9 Get rid of RPM warnings on AlmaLinux 9: "It's not recommended to have unversioned Obsoletes" Reviewed-by: Brian Behlendorf Signed-off-by: Tony Hutter Closes #13584 Closes #13638 --- rpm/generic/zfs-dkms.spec.in | 2 +- rpm/generic/zfs.spec.in | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in index f23347380..196d9a140 100644 --- a/rpm/generic/zfs-dkms.spec.in +++ b/rpm/generic/zfs-dkms.spec.in @@ -31,7 +31,7 @@ Requires(post): gcc, make, perl, diffutils %if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version} Requires: kernel-devel >= @ZFS_META_KVER_MIN@, kernel-devel <= @ZFS_META_KVER_MAX@.999 Requires(post): kernel-devel >= @ZFS_META_KVER_MIN@, kernel-devel <= @ZFS_META_KVER_MAX@.999 -Obsoletes: spl-dkms +Obsoletes: spl-dkms <= %{version} %endif Provides: %{module}-kmod = %{version} AutoReqProv: no diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index 493e93c1f..b1a94fbb7 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -96,7 +96,7 @@ Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libzfs5%{?_isa} = %{version}-%{release} Requires: %{name}-kmod = %{version} Provides: %{name}-kmod-common = %{version}-%{release} -Obsoletes: spl +Obsoletes: spl <= %{version} # zfs-fuse provides the same commands and man pages that OpenZFS does. # Renaming those on either side would conflict with all available documentation. @@ -144,8 +144,8 @@ This package contains the core ZFS command line utilities. %package -n libzpool5 Summary: Native ZFS pool library for Linux Group: System Environment/Kernel -Obsoletes: libzpool2 -Obsoletes: libzpool4 +Obsoletes: libzpool2 <= %{version} +Obsoletes: libzpool4 <= %{version} %description -n libzpool5 This package contains the zpool library, which provides support @@ -161,7 +161,7 @@ for managing zpools %package -n libnvpair3 Summary: Solaris name-value library for Linux Group: System Environment/Kernel -Obsoletes: libnvpair1 +Obsoletes: libnvpair1 <= %{version} %description -n libnvpair3 This package contains routines for packing and unpacking name-value @@ -179,7 +179,7 @@ to write self describing data structures on disk. %package -n libuutil3 Summary: Solaris userland utility library for Linux Group: System Environment/Kernel -Obsoletes: libuutil1 +Obsoletes: libuutil1 <= %{version} %description -n libuutil3 This library provides a variety of compatibility functions for OpenZFS: @@ -205,8 +205,8 @@ This library provides a variety of compatibility functions for OpenZFS: %package -n libzfs5 Summary: Native ZFS filesystem library for Linux Group: System Environment/Kernel -Obsoletes: libzfs2 -Obsoletes: libzfs4 +Obsoletes: libzfs2 <= %{version} +Obsoletes: libzfs4 <= %{version} %description -n libzfs5 This package provides support for managing ZFS filesystems @@ -228,9 +228,9 @@ Requires: libuutil3%{?_isa} = %{version}-%{release} Provides: libzpool5-devel = %{version}-%{release} Provides: libnvpair3-devel = %{version}-%{release} Provides: libuutil3-devel = %{version}-%{release} -Obsoletes: zfs-devel -Obsoletes: libzfs2-devel -Obsoletes: libzfs4-devel +Obsoletes: zfs-devel <= %{version} +Obsoletes: libzfs2-devel <= %{version} +Obsoletes: libzfs4-devel <= %{version} %description -n libzfs5-devel This package contains the header files needed for building additional -- 2.11.4.GIT