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

Standardize RHEL version check in packages 

This is a follow up to 3c35662299 which standardizes how the RHEL
version check is done.  This simpler "0%{?rhel}" check is used
elsewhere in the packages so we do the same here.

Reviewed-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: Rich Ercolani <rincebrain@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13501
This commit is contained in:
Brian Behlendorf 2022-05-25 09:20:17 -07:00
parent 5d9c527536
commit ed16dd7635
3 changed files with 3 additions and 3 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%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9) %if (0%{?fedora}%{?suse_version}) || (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%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9) %if (0%{?fedora}%{?suse_version}) || (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.spec.in
View File

@ -144,7 +144,7 @@ BuildRequires: openssl-devel
BuildRequires: libtirpc-devel BuildRequires: libtirpc-devel
%endif %endif
%if (0%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9) %if (0%{?fedora}%{?suse_version}) || (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