| |
@@ -29,12 +29,6 @@
|
| |
|
| |
%global compdir %(dirname $(pkg-config --variable=compatdir bash-completion))
|
| |
|
| |
- # Enable minimal bootstrap mode
|
| |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1490492
|
| |
- %if 0%{?fedora} > 27
|
| |
- %global bootstrap 1
|
| |
- %endif
|
| |
-
|
| |
%if 0%{?bootstrap}
|
| |
%global build_refman 0
|
| |
%global with_mysql 0
|
| |
@@ -42,7 +36,7 @@
|
| |
%global with_poppler 0
|
| |
%global poppler --without-poppler
|
| |
%global with_spatialite 0
|
| |
- %global spatialite "--without-spatialite"
|
| |
+ %global spatialite --without-spatialite
|
| |
%else
|
| |
# Enable/disable generating refmans
|
| |
# texlive currently broken deps and FTBFS in rawhide
|
| |
@@ -62,13 +56,13 @@
|
| |
%if 0%{?rhel} == 6
|
| |
%ifnarch ppc64
|
| |
%global with_spatialite 0
|
| |
- %global spatialite "--without-spatialite"
|
| |
+ %global spatialite --without-spatialite
|
| |
%endif
|
| |
%endif
|
| |
|
| |
Name: gdal
|
| |
Version: 2.2.3
|
| |
- Release: 3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
| |
+ Release: 5%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
| |
Summary: GIS file format library
|
| |
Group: System Environment/Libraries
|
| |
License: MIT
|
| |
@@ -153,7 +147,7 @@
|
| |
BuildRequires: libdap-devel
|
| |
BuildRequires: librx-devel
|
| |
%if 0%{?with_mysql}
|
| |
- BuildRequires: mysql-devel
|
| |
+ BuildRequires: mariadb-connector-c-devel
|
| |
%endif
|
| |
BuildRequires: numpy
|
| |
BuildRequires: python3-numpy
|
| |
@@ -175,7 +169,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 +422,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 +481,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 +882,13 @@
|
| |
#Or as before, using ldconfig
|
| |
|
| |
%changelog
|
| |
+ * Thu Dec 14 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.2.3-5
|
| |
+ - Cleanup spec file conditionals
|
| |
+
|
| |
+ * Thu Dec 14 2017 Pavel Raiskup <praiskup@redhat.com> - 2.2.3-4
|
| |
+ - drop bootstrap mode
|
| |
+ - build-require mariadb-connector-c-devel (rhbz#1494096)
|
| |
+
|
| |
* 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
|
| |
|
| |
praiskup
commented 6 years ago
https://bugzilla.redhat.com/show_bug.cgi?id=1494096