#4 Cleanup spec file conditionals
Closed 6 years ago by praiskup. Opened 6 years ago by merlinm.
Unknown source master  into  master

file modified
+7 -4
@@ -68,7 +68,7 @@

  

  Name:		gdal

  Version:	2.2.3

- Release:	3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}

+ Release:	4%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}

  Summary:	GIS file format library

  Group:		System Environment/Libraries

  License:	MIT
@@ -175,7 +175,7 @@

  BuildRequires:	swig

  %if %{build_refman}

  BuildRequires:	texlive-latex

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

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

  BuildRequires:	texlive-collection-fontsrecommended

  BuildRequires:	texlive-collection-langcyrillic

  BuildRequires:	texlive-collection-langportuguese
@@ -428,7 +428,7 @@

  # epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024

  # Building without pgeo driver, because it drags in Java

  

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

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

  %global g2clib g2c_v1.6.0

  %else

  %global g2clib grib2c
@@ -487,7 +487,7 @@

  #  #include <fitsio.h>

  

  POPPLER_OPTS="POPPLER_0_20_OR_LATER=yes POPPLER_0_23_OR_LATER=yes POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes"

- %if 0%{?fedora} > 26

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

  POPPLER_OPTS="$POPPLER_OPTS POPPLER_0_58_OR_LATER=yes"

  %endif

  
@@ -888,6 +888,9 @@

  #Or as before, using ldconfig

  

  %changelog

+ * Thu Dec 14 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.2.3-4

+ - Cleanup spec file conditionals

+ 

  * Mon Dec 11 2017 Björn Esser <besser82@fedoraproject.org> - 2.2.3-3.1.bootstrap

  - Add patch to cleanly build against json-c v0.13

  

I'll merge this with #3 if nobody is faster than me (and if there will be no complaint that time).

@praiskup Thank you. There will undoubtedly be a merge conflict with #3 because of the Release line--and we are both trying to bump to the same number. I'm happy to rebase my commit on top of yours if you like.

Np, I'll rebase myself and push manually.

Pull-Request has been closed by praiskup

6 years ago