Compare commits

..

No commits in common. "master" and "f28" have entirely different histories.
master ... f28

13 changed files with 622 additions and 436 deletions

6
.gitignore vendored
View File

@ -37,9 +37,3 @@ gdalautotest-1.7.0.tar.gz
/gdal-2.2.3-fedora.tar.xz
/gdalautotest-2.2.4.tar.gz
/gdal-2.2.4-fedora.tar.xz
/gdalautotest-2.3.1.tar.gz
/gdal-2.3.1-fedora.tar.xz
/gdalautotest-2.3.2.tar.gz
/gdal-2.3.2-fedora.tar.xz
/gdalautotest-3.0.1.zip
/gdal-3.0.1-fedora.tar.xz

View File

@ -1,6 +1,7 @@
diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
--- gdal-3.0.4-fedora/swig/java/java.opt 2020-01-28 11:13:12.000000000 +0100
+++ gdal-3.0.4-fedora-new/swig/java/java.opt 2020-02-06 00:23:36.321286290 +0100
Index: gdal-2.2.3-fedora/swig/java/java.opt
===================================================================
--- gdal-2.2.3-fedora.orig/swig/java/java.opt
+++ gdal-2.2.3-fedora/swig/java/java.opt
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

13
gdal-2.2.2-zlib.patch Normal file
View File

@ -0,0 +1,13 @@
Index: gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/mrf/mrf_band.cpp
+++ gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
@@ -49,7 +49,7 @@
#include <vector>
#include <assert.h>
-#include "../zlib/zlib.h"
+#include <zlib.h>
CPL_CVSID("$Id: mrf_band.cpp 37663 2017-03-09 20:42:19Z lplesea $");

View File

@ -1,5 +1,6 @@
#!/bin/bash
VERSION="3.0.4"
# Volker Fröhlich
VERSION="2.2.4"
tar xvf gdal-"${VERSION}".tar.xz

View File

@ -1,6 +1,7 @@
diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
--- gdal-3.0.4-fedora/scripts/GNUmakefile 2020-01-28 11:13:13.000000000 +0100
+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile 2020-02-06 00:23:36.089287463 +0100
Index: gdal-2.2.3-fedora/scripts/GNUmakefile
===================================================================
--- gdal-2.2.3-fedora.orig/scripts/GNUmakefile
+++ gdal-2.2.3-fedora/scripts/GNUmakefile
@@ -5,6 +5,6 @@ completion:
install:

79
gdal-g2clib.patch Normal file
View File

@ -0,0 +1,79 @@
Index: gdal-2.2.3-fedora/frmts/grib/GNUmakefile
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/GNUmakefile
+++ gdal-2.2.3-fedora/frmts/grib/GNUmakefile
@@ -7,8 +7,7 @@ include ../../GDALmake.opt
OBJ = gribdataset.o \
clock.o \
degrib1.o \
- degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o gridtemplates.o drstemplates.o pdstemplates.o gbits.o g2_free.o g2_unpack1.o g2_unpack2.o g2_unpack3.o g2_unpack4.o g2_unpack5.o g2_unpack6.o g2_unpack7.o g2_info.o g2_getfld.o simunpack.o comunpack.o pack_gp.o reduce.o specpack.o specunpack.o rdieee.o mkieee.o int_power.o simpack.o compack.o cmplxpack.o misspack.o g2_create.o g2_addlocal.o g2_addgrid.o g2_addfield.o g2_gribend.o getdim.o g2_miss.o getpoly.o seekgb.o \
- dec_jpeg2000.o jpcunpack.o jpcpack.o enc_jpeg2000.o
+ degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o
ifeq ($(PNG_SETTING),internal)
EXTRAFLAGS := $(EXTRAFLAGS) -I../png/libpng -DUSE_PNG
@@ -20,7 +19,7 @@ endif
ifeq ($(PNG_SETTING),external)
EXTRAFLAGS := $(EXTRAFLAGS) -DUSE_PNG
-OBJ := $(OBJ) pngpack.o pngunpack.o enc_png.o dec_png.o
+OBJ := $(OBJ)
endif
CPPFLAGS := $(CPPFLAGS) $(EXTRAFLAGS)
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/engribapi.c
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
@@ -419,7 +419,6 @@ int fillSect3 (enGribMeta *en, uShort2 t
double meshLat, double orientLon, double scaleLat1,
double scaleLat2, double southLat, double southLon)
{
- const struct gridtemplate *templatesgrid = get_templatesgrid();
int i; /* loop counter over number of GDS templates. */
double unit; /* Used to convert from stored value to degrees
* lat/lon. See GRIB2 Regulation 92.1.6 */
@@ -641,7 +640,6 @@ int fillSect4_0 (enGribMeta *en, uShort2
double dSurfVal2)
{
int i; /* loop counter over number of PDS templates. */
- const struct pdstemplate *templatespds = get_templatespds();
/* analysis template (0) */
/* In addition templates (1, 2, 5, 8, 9, 12) begin with 4.0 info. */
@@ -1197,7 +1195,6 @@ int fillSect5 (enGribMeta *en, uShort2 t
uChar orderOfDiff)
{
int i; /* loop counter over number of DRS templates. */
- const struct drstemplate *templatesdrs = get_templatesdrs();
/* Find NCEP's template match */
for (i = 0; i < MAXDRSTEMP; i++) {
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/grib2api.c
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
@@ -961,7 +961,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
}
curIndex = 14;
for (i = 0; i < gfld->igdtlen; i++) {
- const struct gridtemplate *templatesgrid = get_templatesgrid();
is3[curIndex] = gfld->igdtmpl[i];
curIndex += abs (templatesgrid[gridIndex].mapgrid[i]);
}
@@ -1029,7 +1028,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
}
curIndex = 9;
for (i = 0; i < gfld->ipdtlen; i++) {
- const struct pdstemplate *templatespds = get_templatespds();
is4[curIndex] = gfld->ipdtmpl[i];
curIndex += abs (templatespds[pdsIndex].mappds[i]);
}
@@ -1047,7 +1045,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
}
curIndex = 11;
for (i = 0; i < gfld->idrtlen; i++) {
- const struct drstemplate *templatesdrs = get_templatesdrs();
is5[curIndex] = gfld->idrtmpl[i];
curIndex += abs (templatesdrs[drsIndex].mapdrs[i]);
}

52
gdal-jni.patch Normal file
View File

@ -0,0 +1,52 @@
Index: gdal-2.2.3-fedora/swig/include/java/gdalconst_java.i
===================================================================
--- gdal-2.2.3-fedora.orig/swig/include/java/gdalconst_java.i
+++ gdal-2.2.3-fedora/swig/include/java/gdalconst_java.i
@@ -13,7 +13,7 @@
static {
try {
- System.loadLibrary("gdalconstjni");
+ System.load("/usr/lib/java/gdal/libgdalconstjni.so");
available = true;
} catch (UnsatisfiedLinkError e) {
available = false;
Index: gdal-2.2.3-fedora/swig/include/java/gdal_java.i
===================================================================
--- gdal-2.2.3-fedora.orig/swig/include/java/gdal_java.i
+++ gdal-2.2.3-fedora/swig/include/java/gdal_java.i
@@ -15,7 +15,7 @@
static {
try {
- System.loadLibrary("gdaljni");
+ System.load("/usr/lib/java/gdal/libgdaljni.so");
available = true;
if (gdal.HasThreadSupport() == 0)
Index: gdal-2.2.3-fedora/swig/include/java/ogr_java.i
===================================================================
--- gdal-2.2.3-fedora.orig/swig/include/java/ogr_java.i
+++ gdal-2.2.3-fedora/swig/include/java/ogr_java.i
@@ -17,7 +17,7 @@
static {
try {
- System.loadLibrary("ogrjni");
+ System.load("/usr/lib/java/gdal/libogrjni.so");
available = true;
if (org.gdal.gdal.gdal.HasThreadSupport() == 0)
Index: gdal-2.2.3-fedora/swig/include/java/osr_java.i
===================================================================
--- gdal-2.2.3-fedora.orig/swig/include/java/osr_java.i
+++ gdal-2.2.3-fedora/swig/include/java/osr_java.i
@@ -20,7 +20,7 @@
static {
try {
- System.loadLibrary("osrjni");
+ System.load("/usr/lib/java/gdal/libosrjni.so");
available = true;
} catch (UnsatisfiedLinkError e) {
available = false;

6
gdal.pom Normal file
View File

@ -0,0 +1,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gdal</groupId>
<artifactId>gdal-java-bindings</artifactId>
<version></version>
</project>

567
gdal.spec
View File

@ -1,3 +1,5 @@
#TODO: g2clib and grib (said to be modified)
#TODO: Python 3 modules should be possible since 1.7
#TODO: Create script to make clean tarball
#TODO: msg needs to have PublicDecompWT.zip from EUMETSAT, which is not free;
# Building without msg therefore
@ -8,13 +10,27 @@
#TODO: e00compr source is the same in the package and bundled in GDAL
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
# Soname should be bumped on API/ABI break
# http://trac.osgeo.org/gdal/ticket/4543
# Conditionals and structures for EL 5 are there
# to make life easier for downstream ELGIS.
# Sadly noarch doesn't work in EL 5, see
# http://fedoraproject.org/wiki/EPEL/GuidelinesAndPolicies
# He also suggest to use --with-static-proj4 to actually link to proj, instead of dlopen()ing it.
# Major digit of the proj so version
%global proj_somaj 12
# Tests can be of a different version
%global testversion 3.0.4
%global testversion 2.2.4
%global run_tests 0
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
%if 0%{?bootstrap}
%global build_refman 0
%global with_mysql 0
%global mysql --without-mysql
%global with_poppler 0
@ -22,6 +38,9 @@
%global with_spatialite 0
%global spatialite --without-spatialite
%else
# Enable/disable generating refmans
# texlive currently broken deps and FTBFS in rawhide
%global build_refman 1
# https://bugzilla.redhat.com/show_bug.cgi?id=1490492
%global with_mysql 1
%global mysql --with-mysql
@ -32,9 +51,6 @@
%global spatialite "--with-spatialite"
%endif
%bcond_with python2
%bcond_without python3
# No ppc64 build for spatialite in EL6
# https://bugzilla.redhat.com/show_bug.cgi?id=663938
%if 0%{?rhel} == 6
@ -45,9 +61,10 @@
%endif
Name: gdal
Version: 3.0.4
Release: 4%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Version: 2.2.4
Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
URL: http://www.gdal.org
# Source0: http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz
@ -55,28 +72,26 @@ URL: http://www.gdal.org
Source0: %{name}-%{version}-fedora.tar.xz
Source1: http://download.osgeo.org/%{name}/%{testversion}/%{name}autotest-%{testversion}.tar.gz
Source2: %{name}.pom
# Cleaner script for the tarball
Source3: %{name}-cleaner.sh
Source4: PROVENANCE.TXT-fedora
# Patch to use system g2clib
Patch1: %{name}-g2clib.patch
# Patch for Fedora JNI library location
Patch2: %{name}-jni.patch
# Fix bash-completion install dir
Patch1: %{name}-completion.patch
# Fedora uses Alternatives for Java
Patch2: %{name}-1.9.0-java.patch
# Ensure rpc/types.h is found by dods driver (indirectly required by libdap/XDRUtils.h)
Patch3: gdal_tirpcinc.patch
# Use libtool to create libiso8211.a, otherwise broken static lib is created since object files are compiled through libtool
Patch4: gdal_iso8211.patch
# Fix makefiles installing libtool wrappers instead of actual executables
Patch5: gdal_installapps.patch
Patch3: %{name}-completion.patch
# Fedora uses Alternatives for Java
Patch8: %{name}-1.9.0-java.patch
Patch9: %{name}-2.2.2-zlib.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: ant
# No armadillo in EL5
BuildRequires: armadillo-devel
@ -92,7 +107,7 @@ BuildRequires: fontconfig-devel
# No freexl in EL5
BuildRequires: freexl-devel
BuildRequires: g2clib-static
BuildRequires: geos-devel >= 3.7.1
BuildRequires: geos-devel
BuildRequires: ghostscript
BuildRequires: hdf-devel
BuildRequires: hdf-static
@ -100,7 +115,7 @@ BuildRequires: hdf5-devel
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jasper-devel
BuildRequires: jpackage-utils
# For 'mvn_artifact' and 'mvn_install'
# add_maven_depmap macro moved into this package in F27, it seems like
BuildRequires: javapackages-local
BuildRequires: json-c-devel
BuildRequires: libgeotiff-devel
@ -127,6 +142,8 @@ BuildRequires: librx-devel
%if 0%{?with_mysql}
BuildRequires: mariadb-connector-c-devel
%endif
BuildRequires: numpy
BuildRequires: python3-numpy
BuildRequires: pcre-devel
BuildRequires: ogdi-devel
BuildRequires: perl-devel
@ -137,33 +154,42 @@ BuildRequires: %{_bindir}/pkg-config
%if 0%{?with_poppler}
BuildRequires: poppler-devel
%endif
BuildRequires: libpq-devel
BuildRequires: proj-devel >= 5.2.0
%if %{with python2}
BuildRequires: postgresql-devel
BuildRequires: proj-devel
BuildRequires: python2-devel
BuildRequires: python2-numpy
%endif
%if %{with python3}
BuildRequires: python3-devel
BuildRequires: python3-numpy
%endif
BuildRequires: sqlite-devel
BuildRequires: swig
%if %{build_refman}
BuildRequires: texlive-latex
BuildRequires: texlive-collection-fontsrecommended
%if 0%{?fedora}
BuildRequires: texlive-collection-langcyrillic
BuildRequires: texlive-collection-langportuguese
%endif
BuildRequires: texlive-collection-latex
BuildRequires: texlive-epstopdf
BuildRequires: tex(multirow.sty)
BuildRequires: tex(sectsty.sty)
BuildRequires: tex(tocloft.sty)
BuildRequires: tex(xtab.sty)
%endif
BuildRequires: unixODBC-devel
BuildRequires: xerces-c-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: libtirpc-devel
BuildRequires: /usr/bin/epstopdf
BuildRequires: /usr/bin/latex
BuildRequires: /usr/bin/dvips
BuildRequires: tex(newunicodechar.sty)
# Run time dependency for gpsbabel driver
Requires: gpsbabel
# proj DL-opened in ogrct.cpp, see also fix in %%prep
%if 0%{?__isa_bits} == 64
Requires: libproj.so.%{proj_somaj}()(64bit)
%else
Requires: libproj.so.%{proj_somaj}
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# We have multilib triage
@ -173,6 +199,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%global cpuarch 64
%endif
%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
#TODO: Description on the lib?
%description
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@ -187,7 +218,15 @@ GDAL/OGR is the most widely used geospatial data access library.
%package devel
Summary: Development files for the GDAL file format library
Group: Development/Libraries
# Old rpm didn't figure out
%if 0%{?rhel} < 6
Requires: pkgconfig
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-static < 1.9.0-1
%description devel
This package contains development files for GDAL.
@ -195,9 +234,9 @@ This package contains development files for GDAL.
%package libs
Summary: GDAL file format library
# See frmts/grib/degrib/README.TXT
Provides: bundled(g2lib) = 1.6.0
Provides: bundled(degrib) = 2.14
Group: System Environment/Libraries
# https://trac.osgeo.org/gdal/ticket/3978#comment:5
Obsoletes: %{name}-ruby < 1.11.0-1
%description libs
This package contains the GDAL file format library.
@ -205,6 +244,7 @@ This package contains the GDAL file format library.
%package java
Summary: Java modules for the GDAL file format library
Group: Development/Libraries
Requires: jpackage-utils
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -214,6 +254,7 @@ The GDAL Java modules provide support to handle multiple GIS file formats.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
Requires: jpackage-utils
BuildArch: noarch
@ -223,13 +264,14 @@ This package contains the API documentation for %{name}.
%package perl
Summary: Perl modules for the GDAL file format library
Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description perl
The GDAL Perl modules provide support to handle multiple GIS file formats.
%if %{with python2}
%package -n python2-gdal
%{?python_provide:%python_provide python2-gdal}
# Remove before F30
@ -237,105 +279,161 @@ Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python modules for the GDAL file format library
Group: Development/Libraries
Requires: numpy
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description -n python2-gdal
The GDAL Python modules provide support to handle multiple GIS file formats.
The package also includes a couple of useful utilities in Python.
%endif
%if %{with python3}
%package -n python3-gdal
%{?python_provide:%python_provide python3-gdal}
%package python3
Summary: Python modules for the GDAL file format library
Group: Development/Libraries
Requires: python3-numpy
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: gdal-python3 < 2.3.1
Provides: gdal-python3 = %version-%release
%description -n python3-gdal
%description python3
The GDAL Python 3 modules provide support to handle multiple GIS file formats.
%endif
%if %{with python2} || %{with python3}
%package python-tools
Summary: Python tools for the GDAL file format library
Requires: %{?with_python3:python3-gdal}%{?!with_python3:python2-gdal}
%description python-tools
The GDAL Python package provides number of tools for programming and
manipulating GDAL file format library
%endif
%package doc
Summary: Documentation for GDAL
Group: Documentation
BuildArch: noarch
%description doc
This package contains documentation for GDAL.
This package contains HTML and PDF documentation for GDAL.
# We don't want to provide private Python extension libs
%if %{with python2} && %{with python3}
%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\.so$
%elif %{with python2}
%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$
%elif %{with_python3}
%global __provides_exclude_from ^%{python3_sitearch}/.*\.so$
%endif
%prep
%autosetup -p1 -n %{name}-%{version}-fedora -a 1
%setup -q -n %{name}-%{version}-fedora -a 1
# Delete bundled libraries
rm -rf frmts/zlib
rm -rf frmts/png/libpng
rm -rf frmts/gif/giflib
rm -rf frmts/jpeg/libjpeg
rm -rf frmts/jpeg/libjpeg12
rm -rf frmts/gtiff/libgeotiff
rm -rf frmts/gtiff/libtiff
rm -rf frmts/jpeg/libjpeg \
frmts/jpeg/libjpeg12
rm -rf frmts/gtiff/libgeotiff \
frmts/gtiff/libtiff
rm -r frmts/grib/degrib18/g2clib-1.0.4
%patch1 -p1 -b .g2clib~
%patch2 -p1 -b .jni~
%patch3 -p1 -b .completion~
%patch8 -p1 -b .java~
%patch9 -p1 -b .zlib~
# Copy in PROVENANCE.TXT-fedora
cp -p %SOURCE4 .
# Sanitize permissions
chmod 644 apps/gnmanalyse.cpp apps/gnmmanage.cpp
# Sanitize linebreaks and encoding
#TODO: Don't touch data directory!
# /frmts/grib/degrib18/degrib/metaname.cpp
# and geoconcept.c are potentially dangerous to change
set +x
for f in `find . -type f` ; do
if file $f | grep -q ISO-8859 ; then
set -x
iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
mv -f ${f}.tmp $f
set +x
fi
if file $f | grep -q CRLF ; then
set -x
sed -i -e 's|\r||g' $f
set +x
fi
done
set -x
# Solved for 2.0
for f in ogr/ogrsf_frmts/gpsbabel ogr/ogrsf_frmts/pgdump port apps; do
pushd $f
chmod 644 *.cpp *.h
popd
done
# Replace hard-coded library- and include paths
sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' GDALmake.opt.in
sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' configure
sed -i 's|-I\$with_cfitsio -I\$with_cfitsio/include|-I\$with_cfitsio/include/cfitsio|g' configure
sed -i 's|-L\$with_netcdf -L\$with_netcdf/lib -lnetcdf|-lnetcdf|g' configure
sed -i 's|-L\$DODS_LIB -ldap++|-ldap++|g' configure
sed -i 's|-L\$with_ogdi -L\$with_ogdi/lib -logdi|-logdi|g' configure
sed -i 's|-L\$with_jpeg -L\$with_jpeg/lib -ljpeg|-ljpeg|g' configure
sed -i 's|-L\$with_libtiff\/lib -ltiff|-ltiff|g' configure
sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' configure
sed -i 's|-L\$with_geotiff\/lib -lgeotiff $LIBS|-lgeotiff $LIBS|g' configure
# libproj is dlopened; upstream sources point to .so, which is usually not present
# http://trac.osgeo.org/gdal/ticket/3602
sed -i 's|libproj.so|libproj.so.%{proj_somaj}|g' ogr/ogrct.cpp
# Fix Python installation path
sed -i 's|setup.py install|setup.py install --root=$DESTDIR|' swig/python/GNUmakefile
# Fix Python samples to depend on correct interpreter
mkdir -p swig/python3/samples
pushd swig/python/samples
for f in `find . -name '*.py'`; do
sed 's|^#!.\+python$|#!/usr/bin/python3|' $f > ../../python3/samples/$f
chmod --reference=$f ../../python3/samples/$f
sed -i 's|^#!.\+python$|#!/usr/bin/python2|' $f
done
popd
# Adjust check for LibDAP version
# http://trac.osgeo.org/gdal/ticket/4545
%if %cpuarch == 64
sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure.ac
sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure
%endif
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure.ac
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
# Add our custom cflags when trying to find geos
# https://bugzilla.redhat.com/show_bug.cgi?id=1284714
sed -i 's|CFLAGS=\"${GEOS_CFLAGS}\"|CFLAGS=\"${CFLAGS} ${GEOS_CFLAGS}\"|g' configure
%build
#TODO: Couldn't I have modified that in the prep section?
%ifarch sparcv9 sparc64 s390 s390x
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
%else
export CFLAGS="$RPM_OPT_FLAGS -fpic"
%endif
export CXXFLAGS="$CFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc"
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc"
# For future reference:
# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024
# Building without pgeo driver, because it drags in Java
autoreconf -ifv
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
%global g2clib g2c_v1.6.0
%else
%global g2clib grib2c
%endif
%configure \
LIBS="-l%{g2clib} -ltirpc" \
--with-autoload=%{_libdir}/%{name}plugins \
--datadir=%{_datadir}/%{name}/ \
--includedir=%{_includedir}/%{name}/ \
--prefix=%{_prefix} \
--with-armadillo \
--with-curl \
--with-cfitsio \
--with-cfitsio=%{_prefix} \
--with-dods-root=%{_prefix} \
--with-expat \
--with-freexl \
--with-geos \
--with-geotiff \
--with-geotiff=external \
--with-gif \
--with-gta \
--with-hdf4 \
@ -346,53 +444,75 @@ autoreconf -ifv
--with-libjson-c \
--without-jpeg12 \
--with-liblzma \
--with-libtiff \
--with-libtiff=external \
--with-libz \
--without-mdb \
--without-msg \
%{mysql} \
--with-netcdf \
--with-odbc \
--with-ogdi \
--without-msg \
--with-openjpeg \
--with-pcraster \
--with-pg \
--with-png \
%{poppler} \
--with-proj \
%{spatialite} \
--with-sqlite3 \
--with-threads \
--with-webp \
--with-xerces \
--enable-shared \
--with-perl \
--with-python \
--with-libkml
%make_build
# {?_smp_mflags} doesn't work; Or it does -- who knows!
# NOTE: running autoconf seems to break build:
# fitsdataset.cpp:37:10: fatal error: fitsio.h: No such file or directory
# #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 || 0%{?rhel} > 7
POPPLER_OPTS="$POPPLER_OPTS POPPLER_0_58_OR_LATER=yes"
%endif
make %{?_smp_mflags} $POPPLER_OPTS
make man
make docs
# Make Perl modules
pushd swig/perl
perl Makefile.PL; make;
echo > Makefile.PL;
popd
# Build some utilities, as requested in BZ #1271906
make -C ogr/ogrsf_frmts/s57 all
make -C frmts/iso8211 all
pushd ogr/ogrsf_frmts/s57/
make all
popd
pushd frmts/iso8211/
make all
popd
# Install the Perl modules in the right place
sed -i 's|INSTALLDIRS = site|INSTALLDIRS = vendor|' swig/perl/Makefile_*
# Don't append installation info to pod
#TODO: What about the pod?
sed -i 's|>> $(DESTINSTALLARCHLIB)\/perllocal.pod|> \/dev\/null|g' swig/perl/Makefile_*
# Make Java module and documentation
pushd swig/java
make
ant maven
./make_doc.sh
popd
%mvn_artifact swig/java/build/maven/gdal-%version.pom swig/java/build/maven/gdal-%version.jar
# Make Python modules
# Make Python 3 module
pushd swig/python
%{?with_python2:%py2_build}
%{?with_python3:%py3_build}
popd
# Make Perl modules
pushd swig/perl
perl Makefile.PL INSTALLDIRS=vendor
%make_build
%{__python3} setup.py build
popd
# --------- Documentation ----------
@ -400,30 +520,47 @@ popd
# No useful documentation in swig
%global docdirs apps doc doc/br doc/ru ogr ogr/ogrsf_frmts frmts/gxf frmts/iso8211 frmts/pcidsk frmts/sdts frmts/vrt ogr/ogrsf_frmts/dgn/
for docdir in %{docdirs}; do
# CreateHTML and PDF documentation, if specified
pushd $docdir
if [ ! -f Doxyfile ]; then
doxygen -g
else
doxygen -u
fi
sed -i -e 's|^GENERATE_LATEX|GENERATE_LATEX = YES\n#GENERATE_LATEX |' Doxyfile
sed -i -e 's|^GENERATE_HTML|GENERATE_HTML = YES\n#GENERATE_HTML |' Doxyfile
sed -i -e 's|^USE_PDFLATEX|USE_PDFLATEX = YES\n#USE_PDFLATEX |' Doxyfile
if [ $docdir == "doc/ru" ]; then
sed -i -e 's|^OUTPUT_LANGUAGE|OUTPUT_LANGUAGE = Russian\n#OUTPUT_LANGUAGE |' Doxyfile
fi
rm -rf html
rm -rf latex html
doxygen
%if %{build_refman}
pushd latex
sed -i -e '/rfoot\[/d' -e '/lfoot\[/d' doxygen.sty
sed -i -e '/small/d' -e '/large/d' refman.tex
sed -i -e 's|pdflatex|pdflatex -interaction nonstopmode |g' Makefile
make refman.pdf || true
popd
%endif
popd
done
%install
rm -rf %{buildroot}
# Install Python 3 module
# Must be done first so executables are Python 2.
pushd swig/python
%{?with_python2:%py2_install}
%{?with_python3:%py3_install}
%{__python3} setup.py install --skip-build --root %{buildroot}
popd
%make_install -C swig/perl
%make_install install-man
make DESTDIR=%{buildroot} \
install \
install-man
install -pm 755 ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir}
install -pm 755 frmts/iso8211/8211createfromxml %{buildroot}%{_bindir}
@ -435,19 +572,28 @@ mkdir -p %{buildroot}%{_libdir}/%{name}plugins
#TODO: Don't do that?
find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \;
rm %{buildroot}%{perl_archlib}/perllocal.pod
%if %{without python} && %{without python3}
rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
%endif
rm -f %{buildroot}%{perl_archlib}/perllocal.pod
# Correct permissions
#TODO and potential ticket: Why are the permissions not correct?
find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \;
# install Java plugin
%mvn_install -J swig/java/java
#TODO: JAR files that require JNI shared objects MUST be installed in %%{_libdir}/%%{name}. The JNI shared objects themselves must also be installed in %%{_libdir}/%%{name}.
#Java programs that wish to make calls into native libraries do so via the Java Native Interface (JNI). A Java package uses JNI if it contains a .so
#If the JNI-using code calls System.loadLibrary you'll have to patch it to use System.load, passing it the full path to the dynamic shared object. If the package installs a wrapper script you'll need to manually add %%{_libdir}/%%{name}/<jar filename> to CLASSPATH. If you are depending on a JNI-using JAR file, you'll need to add it manually -- build-classpath will not find it.
touch -r NEWS swig/java/gdal.jar
mkdir -p %{buildroot}%{_javadir}
cp -p swig/java/gdal.jar \
%{buildroot}%{_javadir}/%{name}.jar
# Install Maven pom and update version number
install -dm 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
sed -i 's|<version></version>|<version>%{version}</version>|' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# Create depmap fragment
%add_maven_depmap JPP-%{name}.pom %{name}.jar
# 775 on the .so?
# copy JNI libraries and links, non versioned link needed by JNI
@ -467,6 +613,14 @@ for docdir in %{docdirs}; do
path=%{_builddir}/%{name}-%{version}-fedora/refman
mkdir -p $path/html/$docdir
cp -r html $path/html/$docdir
# Install all Refmans
%if %{build_refman}
if [ -f latex/refman.pdf ]; then
mkdir -p $path/pdf/$docdir
cp latex/refman.pdf $path/pdf/$docdir
fi
%endif
popd
done
@ -500,6 +654,26 @@ EOF
#<<<<<<<<<<<<<
touch -r NEWS port/cpl_config.h
# Create and install pkgconfig file
#TODO: Why does that exist? Does Grass really use it? I don't think so.
# http://trac.osgeo.org/gdal/ticket/3470
#>>>>>>>>>>>>>
cat > %{name}.pc <<EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
includedir=%{_includedir}
Name: GDAL
Description: GIS file format library
Version: %{version}
Libs: -L\${libdir} -lgdal
Cflags: -I\${includedir}/%{name}
EOF
#<<<<<<<<<<<<<
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
install -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
touch -r NEWS %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
# Multilib gdal-config
# Rename the original script to gdal-config-$arch (stores arch-specific information)
@ -525,6 +699,9 @@ EOF
touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
chmod 755 %{buildroot}%{_bindir}/%{name}-config
# Clean up junk
rm -f %{buildroot}%{_bindir}/*.dox
#jni-libs and libgdal are also built static (*.a)
#.exists and .packlist stem from Perl
for junk in {*.a,*.la,*.bs,.exists,.packlist} ; do
@ -532,8 +709,22 @@ for junk in {*.a,*.la,*.bs,.exists,.packlist} ; do
done
# Don't duplicate license files
rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
rm -f %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
# Throw away random API man mages plus artefact seemingly caused by Doxygen 1.8.1 or 1.8.1.1
for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetProperty EnhanceCBInfo ListFieldDesc NamedColor OGRSplitListFieldLayer VRTBuilder; do
rm -rf %{buildroot}%{_mandir}/man1/$f.1*
done
# Fix python interpreter
sed -i '1s|^#!/usr/bin/env python$|#!%{__python2}|' %{buildroot}%{_bindir}/*.py
# Cleanup .pyc for now
rm -f %{buildroot}%{_bindir}/*.pyc
#TODO: What's that?
rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_*
rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1*
%check
%if %{run_tests}
@ -564,11 +755,12 @@ pushd %{name}autotest-%{testversion}
# Run tests but force normal exit in the end
./run_all.py || true
popd
%endif
#%%{run_tests}
%endif #%%{run_tests}
%ldconfig_scriptlets libs
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
@ -609,9 +801,8 @@ popd
%files libs
%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
%{_libdir}/libgdal.so.26
%{_libdir}/libgdal.so.26.*
%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITERS PROVENANCE.TXT-fedora
%{_libdir}/libgdal.so.*
%{_datadir}/%{name}
#TODO: Possibly remove files like .dxf, .dgn, ...
%dir %{_libdir}/%{name}plugins
@ -628,30 +819,38 @@ popd
# Can I even have a separate Java package anymore?
%files java -f .mfiles
%doc swig/java/apps
%{_jnidir}/%{name}/libgdalalljni.so*
%{_jnidir}/%{name}/
%files javadoc -f .mfiles-javadoc
%files javadoc
%{_javadocdir}/%{name}
%files perl
%doc swig/perl/README
%{perl_vendorarch}/*
%{_mandir}/man3/*.3pm*
%if %{with python2}
%files -n python2-gdal
%doc swig/python/README.rst
%doc swig/python/README.txt
%doc swig/python/samples
#TODO: Bug with .py files in EPEL 5 bindir, see http://fedoraproject.org/wiki/EPEL/GuidelinesAndPolicies
%{_bindir}/*.py
%{_mandir}/man1/pct2rgb.1*
%{_mandir}/man1/rgb2pct.1*
%{_mandir}/man1/gdal2tiles.1*
%{_mandir}/man1/gdal_fillnodata.1*
%{_mandir}/man1/gdal_merge.1*
%{_mandir}/man1/gdal_retile.1*
%{_mandir}/man1/gdal_sieve.1*
%{python2_sitearch}/osgeo
%{python2_sitearch}/GDAL-%{version}-py*.egg-info
%{python2_sitearch}/osr.py*
%{python2_sitearch}/ogr.py*
%{python2_sitearch}/gdal*.py*
%endif
%{python2_sitearch}/gnm.py*
%if %{with python3}
%files -n python3-gdal
%doc swig/python/README.rst
%doc swig/python/samples
%files python3
%doc swig/python/README.txt
%doc swig/python3/samples
%{python3_sitearch}/osgeo
%{python3_sitearch}/GDAL-%{version}-py*.egg-info
%{python3_sitearch}/osr.py
@ -660,19 +859,8 @@ popd
%{python3_sitearch}/__pycache__/ogr.*.py*
%{python3_sitearch}/gdal*.py
%{python3_sitearch}/__pycache__/gdal*.*.py*
%endif
%if %{with python2} || %{with python3}
%files python-tools
%_bindir/*.py
%{_mandir}/man1/pct2rgb.1*
%{_mandir}/man1/rgb2pct.1*
%{_mandir}/man1/gdal2tiles.1*
%{_mandir}/man1/gdal_fillnodata.1*
%{_mandir}/man1/gdal_merge.1*
%{_mandir}/man1/gdal_retile.1*
%{_mandir}/man1/gdal_sieve.1*
%endif
%{python3_sitearch}/gnm.py*
%{python3_sitearch}/__pycache__/gnm.*.py*
%files doc
%doc gdal_frmts ogrsf_frmts refman
@ -686,107 +874,6 @@ popd
#Or as before, using ldconfig
%changelog
* Wed Apr 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.4-4
- Re-enable annobin
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.4-3
- Rebuild (json-c)
- Temporarily disable annobin, as it is broken
* Tue Mar 03 2020 Sandro Mani <manisandro@gmail.com> - 3.0.4-2
- Fix libtool wrappers installed for gdal utilities instead of actual binaries
* Wed Feb 05 2020 Sandro Mani <manisandro@gmail.com> - 3.0.4-1
- Update to 3.0.4
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 18 2020 Rich Mattes <richmattes@gmail.com> - 2.3.2-15
- Patch out include that was removed in newer poppler
- Remove comment following an endif in the specfile
* Sat Jan 18 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.2-15
- F-32: rebuild against new poppler
* Tue Sep 17 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.3.2-14
- Fix linkage against Proj
* Mon Sep 16 2019 Sandro Mani <manisandro@gmail.com> - 2.3.2-13
- Bump proj_somaj for proj 6
* Wed Sep 4 2019 Devrim Gündüz <devrim@gunduzorg> - 2.3.2-12
- Rebuild for new Proj
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3.2-11
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.2-9
- Perl 5.30 rebuild
* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com>
- Rebuild for hdf5 1.10.5
* Tue Feb 05 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3.2-7
- Drop Python 2 subpackage for mass Python 2 packages removal
* Mon Feb 04 2019 Pavel Raiskup <praiskup@redhat.com> - 2.3.2-6
- modernize java packaging (PR#9)
* Mon Feb 04 2019 Devrim Gündüz <devrim@gunduzorg> - 2.3.2-6
- Rebuild for new GeOS and Proj
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jan 26 2019 Marek Kasik <mkasik@redhat.com> - 2.3.2-4
- Additional fixes for the rebuild
* Fri Jan 25 2019 Marek Kasik <mkasik@redhat.com> - 2.3.2-3
- Rebuild for poppler-0.73.0
* Thu Oct 04 2018 Pavel Raiskup <praiskup@redhat.com> - 2.3.2-2
- Python 3 is the default Python now
* Mon Oct 1 2018 Volker Fröhlich <volker27@gmx.at> - 2.3.2-1
- New upstream release
* Mon Aug 27 2018 José Abílio Matos <jamatos@fc.up.pt> - 2.3.1-3
- rebuild for armadillo soname bump (take 2)
* Fri Aug 17 2018 José Abílio Matos <jamatos@fc.up.pt> - 2.3.1-2
- rebuild for armadillo soname bump
* Tue Aug 14 2018 Volker Fröhlich <volker27@gmx.at> - 2.3.1-1
- New upstream release
* Tue Aug 14 2018 Marek Kasik <mkasik@redhat.com> - 2.2.4-10
- Rebuild for poppler-0.67.0
* Wed Jul 25 2018 Devrim Gündüz <devrim@gunduz.org> - 2.2.4-9
- Fix #1606875
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 2.2.4-7
- Perl 5.28 rebuild
* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.4-6
- Perl 5.28 rebuild
* Fri Jun 22 2018 Orion Poplawski <orion@nwra.com> - 2.2.4-5
- Rebuild for libdap 3.19.1
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.4-4
- Rebuilt for Python 3.7
* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 2.2.4-3
- rebuilt for cfitsio 3.450
* Tue Mar 27 2018 Björn Esser <besser82@fedoraproject.org> - 2.2.4-2
- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28

View File

@ -1,11 +0,0 @@
diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
--- gdal-3.0.4-fedora/apps/GNUmakefile 2020-01-28 11:13:12.000000000 +0100
+++ gdal-3.0.4-fedora-new/apps/GNUmakefile 2020-03-03 23:17:41.032487778 +0100
@@ -216,6 +216,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default
for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
+ for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config

View File

@ -1,13 +0,0 @@
diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile 2020-02-06 00:24:10.382117696 +0100
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)
$(ISOLIB): $(OBJ:.o=.$(OBJ_EXT))
- $(AR) r $(ISOLIB) $?
- $(RANLIB) $(ISOLIB)
+ $(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
8211createfromxml$(EXE): 8211createfromxml.$(OBJ_EXT)
$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)

View File

@ -1,24 +0,0 @@
diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.0.4-fedora/frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC)
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
default: $(O_OBJ:.o=.$(OBJ_EXT))

View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
SHA512 (gdalautotest-2.2.4.tar.gz) = c7dd8e007c84b112f7d6384d5e28981a929b81409b41bd02495c4d7b99a72aa4ee92884a90e0246c3b1c8c723b9272979a89f15b00794abebde97a36d6344ee9
SHA512 (gdal-2.2.4-fedora.tar.xz) = a8c878c0b9ea56575eaa72434990a1473a9dfc40dc7794d0a752846b0f945e8f38da02b7a264f7450b44ba3d021ee7af6e1ec6be57e955594f4b33caa4d1ddd0