#1 Update for next RHEL major release
Closed 6 years ago by yselkowitz. Opened 6 years ago by yselkowitz.
rpms/ yselkowitz/rubygem-nokogiri master  into  master

file modified
+2 -2
@@ -45,7 +45,7 @@ 

  #Patch0:		rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch

  # Shut down libxml2 version unmatching warning

  Patch0:	%{name}-1.6.6.4-shutdown-libxml2-warning.patch

- %if 0%{?fedora} >= 19

+ %if 0%{?fedora} >= 19 || 0%{?rhel} > 7

  Requires:	ruby(release)

  BuildRequires:	ruby(release)

  %else
@@ -164,7 +164,7 @@ 

  find %{buildroot} -name \*.orig_\* | xargs rm -vf

  

  # move arch dependent files to %%gem_extdir

- %if 0%{?fedora} >= 21

+ %if 0%{?fedora} >= 21 || 0%{?rhel} > 7

  mkdir -p %{buildroot}%{gem_extdir_mri}

  cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/

  

no initial comment

The first hunk is completely wrong assuming there will be dependency generators available in RHEL8. There should not be any requires and we should go just with ruby(release).

The second hunk, considering the branches are targeted towards epel, but epel branch actually does not use them, I would suggest to drop the branches as well.

IMO, it would be much better to cleanup all the branching and clean up the .spec file.

The patch is technically correct in that it consists of the minimal changes necessary for compatibility with the version of ruby that would land in the next version of RHEL. However, if you would prefer a simple unbranching -- which would break compatibility with EL6/7 -- I can propose a separate PR.

Pull-Request has been closed by yselkowitz

6 years ago

Sorry, I ended up pushing to rawhide instead of my fork. While a scratch build was successful, I'll refrain from starting a real build until you review the commit.

Sorry, I ended up pushing to rawhide instead of my fork. While a scratch build was successful, I'll refrain from starting a real build until you review the commit.

Now I reviewed your change and it seems okay.

Metadata