Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Modified ncompress requirement in RPM to exclude RHEL9 

The bug this was working around is no longer present.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #13480 
Closes #13490
This commit is contained in:
Rich Ercolani 2022-05-24 12:39:32 -04:00 committed by GitHub
parent cf70c0f8ae
commit 3c35662299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm/generic/zfs-dkms.spec.in
View File

@ -36,7 +36,7 @@ Obsoletes: spl-dkms
Provides: %{module}-kmod = %{version} Provides: %{module}-kmod = %{version}
AutoReqProv: no AutoReqProv: no
%if 0%{?rhel}%{?fedora}%{?suse_version} %if (0%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9)
# We don't directly use it, but if this isn't installed, rpmbuild as root can # We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb # crash+corrupt rpmdb
# See issue #12071 # See issue #12071

2
rpm/generic/zfs-kmod.spec.in
View File

@ -57,7 +57,7 @@ BuildRequires: gcc, make
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
%endif %endif
%if 0%{?rhel}%{?fedora}%{?suse_version} %if (0%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9)
# We don't directly use it, but if this isn't installed, rpmbuild as root can # We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb # crash+corrupt rpmdb
# See issue #12071 # See issue #12071

7
rpm/generic/zfs.spec.in
View File

@ -110,12 +110,15 @@ BuildRequires: libblkid-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?centos} >= 8
BuildRequires: libtirpc-devel
%endif
%if (0%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9)
# We don't directly use it, but if this isn't installed, rpmbuild as root can # We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb # crash+corrupt rpmdb
# See issue #12071 # See issue #12071
BuildRequires: ncompress BuildRequires: ncompress
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?centos} >= 8
BuildRequires: libtirpc-devel
%endif %endif
Requires: openssl Requires: openssl