Modified ncompress requirement in RPM to exclude RHEL9 #13490

rincebrain · 2022-05-21T16:02:43Z

Motivation and Context

#13480
The bug this was working around is no longer present in RHEL9, and neither is the ncompress package.

Description

Just copied the old logic from the PR to exclude newer EL versions.

How Has This Been Tested?

The RPM did not build on my RHEL9 testbed without this change, and did with.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Performance enhancement (non-breaking change which improves efficiency)
Code cleanup (non-breaking change which makes code smaller or more readable)
Breaking change (fix or feature that would cause existing functionality to change)
Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the OpenZFS code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
I have run the ZFS Test Suite with this change applied.
All commit messages are properly formatted and contain Signed-off-by.

The bug this was working around is no longer present. Signed-off-by: Rich Ercolani <rincebrain@gmail.com>

Conan-Kudo · 2022-05-24T16:43:04Z

rpm/generic/zfs-dkms.spec.in

@@ -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)


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?

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. :)

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 openzfs#13480 Closes openzfs#13490

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

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 openzfs#13480 Closes openzfs#13490

Modified ncompress requirement in RPM to exclude RHEL9

969d37e

The bug this was working around is no longer present. Signed-off-by: Rich Ercolani <rincebrain@gmail.com>

rincebrain mentioned this pull request May 21, 2022

ncompress deprecated in RHEL 8 and removed in RHEL 9 #13480

Closed

behlendorf approved these changes May 24, 2022

View reviewed changes

behlendorf added Component: Packaging custom packages Status: Accepted Ready to integrate (reviewed, tested) labels May 24, 2022

behlendorf merged commit 3c35662 into openzfs:master May 24, 2022

Conan-Kudo reviewed May 24, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modified ncompress requirement in RPM to exclude RHEL9 #13490

Modified ncompress requirement in RPM to exclude RHEL9 #13490

rincebrain commented May 21, 2022

Conan-Kudo May 24, 2022

rincebrain May 24, 2022

Modified ncompress requirement in RPM to exclude RHEL9 #13490

Modified ncompress requirement in RPM to exclude RHEL9 #13490

Conversation

rincebrain commented May 21, 2022

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

Conan-Kudo May 24, 2022

Choose a reason for hiding this comment

rincebrain May 24, 2022

Choose a reason for hiding this comment