Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified ncompress requirement in RPM to exclude RHEL9 #13490

Merged
merged 1 commit into from
May 24, 2022
Merged

Modified ncompress requirement in RPM to exclude RHEL9 #13490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpm/generic/zfs-dkms.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Obsoletes: spl-dkms
Provides: %{module}-kmod = %{version}
AutoReqProv: no

%if 0%{?rhel}%{?fedora}%{?suse_version}
%if (0%{?fedora}%{?suse_version}) || (0 < 0%{?rhel} && 0%{?rhel} < 9)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This RHEL clause makes no sense. It should be (0%{?rhel} && 0%{?rhel} < 9) or (0%{?rhel} > 0 && 0%{?rhel} < 9). I'm not even sure what a < 0 does here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My vague recollection is that some older specfile version didn't allow you to get away with just 0%{?rhel}.

Or maybe my brain is rotten. It's a toss-up, really. :)

# We don't directly use it, but if this isn't installed, rpmbuild as root can
# crash+corrupt rpmdb
# See issue #12071
Expand Down
2 changes: 1 addition & 1 deletion rpm/generic/zfs-kmod.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ BuildRequires: gcc, make
BuildRequires: elfutils-libelf-devel
%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
# crash+corrupt rpmdb
# See issue #12071
Expand Down
7 changes: 5 additions & 2 deletions rpm/generic/zfs.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,15 @@ BuildRequires: libblkid-devel
BuildRequires: libudev-devel
BuildRequires: libattr-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
# crash+corrupt rpmdb
# See issue #12071
BuildRequires: ncompress
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?centos} >= 8
BuildRequires: libtirpc-devel
%endif

Requires: openssl
Expand Down