#9 Minor conditional fixes for ELN
Merged 4 years ago by tmz. Opened 4 years ago by merlinm.
rpms/ merlinm/git eln  into  master

file modified
+11 -3
@@ -8,14 +8,19 @@ 

  

  # Settings for Fedora

  %if 0%{?fedora}

- %bcond_without              asciidoctor

  # linkchecker is not available on EL

  %bcond_without              linkcheck

  %else

- %bcond_with                 asciidoctor

  %bcond_with                 linkcheck

  %endif

  

+ # Settings for Fedora and EL >= 9

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

+ %bcond_without              asciidoctor

+ %else

+ %bcond_with                 asciidoctor

+ %endif

+ 

  # Settings for Fedora and EL > 7

  %if 0%{?fedora} || 0%{?rhel} > 7

  %bcond_with                 python2
@@ -85,7 +90,7 @@ 

  

  Name:           git

  Version:        2.26.2

- Release:        1%{?rcrev}%{?dist}

+ Release:        2%{?rcrev}%{?dist}

  Summary:        Fast Version Control System

  License:        GPLv2

  URL:            https://git-scm.com/
@@ -1060,6 +1065,9 @@ 

  %{?with_docs:%{_pkgdocdir}/git-svn.html}

  

  %changelog

+ * Thu May 21 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.26.2-2

+ - Minor conditional fixes for ELN

+ 

  * Mon Apr 20 2020 Todd Zullinger <tmz@pobox.com> - 2.26.2-1

  - update to 2.26.2 (CVE-2020-11008)

  

Hi Merlin! Thanks for this. It's nice to see ELN already moving forward with asciidoctor support.

What about squashing this in:

diff --git i/git.spec w/git.spec
index d2c6ee2..a5b1529 100644
--- i/git.spec
+++ w/git.spec
@@ -6,6 +6,14 @@

 %global gitexecdir          %{_libexecdir}/git-core

+# Settings for Fedora
+%if 0%{?fedora}
+# linkchecker is not available on EL
+%bcond_without              linkcheck
+%else
+%bcond_with                 linkcheck
+%endif
+
 # Settings for Fedora and EL >= 9
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without              asciidoctor
@@ -13,13 +21,6 @@
 %bcond_with                 asciidoctor
 %endif

-# linkchecker is not available on EL
-%if 0%{?fedora}
-%bcond_without              linkcheck
-%else
-%bcond_with                 linkcheck
-%endif
-
 # Settings for Fedora and EL > 7
 %if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with                 python2

That keeps the if fedora conditional first. While it might be some time before we have much more Fedora-specific stuff, it will surely happen as EL-9 begins to stabilize.

I think it also makes the diff for this change against master much clearer (this is with the diff above squashed in):

diff --git a/git.spec b/git.spec
index bebca5a..a5b1529 100644
--- a/git.spec
+++ b/git.spec
@@ -8,14 +8,19 @@

 # Settings for Fedora
 %if 0%{?fedora}
-%bcond_without              asciidoctor
 # linkchecker is not available on EL
 %bcond_without              linkcheck
 %else
-%bcond_with                 asciidoctor
 %bcond_with                 linkcheck
 %endif

+# Settings for Fedora and EL >= 9
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without              asciidoctor
+%else
+%bcond_with                 asciidoctor
+%endif
+
 # Settings for Fedora and EL > 7
 %if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with                 python2

If that looks good to you, I can easily squash that in and apply/push it to master. (I don't think pagure supports letting others push to the PR ref yet -- but maybe that's changed.) Whatever is easiest.

rebased onto 24de439

4 years ago

@tmz Thank you for the feedback. That makes a ton of sense! I should have done that in the first place. I pushed that update.

Excellent. I'll merge that now. Just curious, do we need a build for rawhide or is just having it committed all that's necessary to test it for ELN?

I ask because 2.27.0-rc1 was released yesterday. I have an update for that prepared and thought I'd push it to rawhide in a day or so (just in case someone notices a major issue). Nothing turned up with rc0, so I expect rc1 will be pretty solid as usual. Around rc1 is where I often push to rawhide to get a little more testing of the release candidates.

Thanks!

Pull-Request has been merged by tmz

4 years ago

@tmz Thanks! Ideally we want the package NVRs in Fedora and Rawhide to match, but this PR is ultimately a no-change update for Rawhide so there's no pressing need for a build--especially if you're going to be building a new release imminently. I'll set myself a reminder to check back in a few days and make sure the update builds for ELN. Or, if you want to try it yourself, just run fedpkg build --target eln from the master branch.