Skip to content

Commit

Permalink
rpm: Silence "unversioned Obsoletes" warnings on EL 9
Browse files Browse the repository at this point in the history
Get rid of RPM warnings on AlmaLinux 9:

"It's not recommended to have unversioned Obsoletes"

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#13584
Closes openzfs#13638
  • Loading branch information
tonyhutter authored and andrewc12 committed Sep 23, 2022
1 parent e95334e commit f9e9034
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion rpm/generic/zfs-dkms.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions rpm/generic/zfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f9e9034

Please sign in to comment.