diff --git a/.gitignore b/.gitignore index a219059..71e0fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,138 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-1.9.0.tar.gz /gdal-1.9.1-fedora.tar.gz /gdal-1.9.2-fedora.tar.gz +/gdal-1.10.0-fedora.tar.gz +/gdal-1.10.1-fedora.tar.xz +/gdalautotest-1.10.1.tar.gz +/gdal-1.11.0-fedora.tar.xz +/gdalautotest-1.11.0.tar.gz +/gdal-1.11.1-fedora.tar.xz +/gdalautotest-1.11.1.tar.gz +/gdalautotest-1.11.2.tar.gz +/gdal-1.11.2-fedora.tar.xz +/gdal-2.0.0-fedora.tar.xz +/gdalautotest-2.0.0.tar.gz +/gdalautotest-2.0.1.tar.gz +/gdal-2.0.1-fedora.tar.xz +/gdalautotest-2.0.2.tar.gz +/gdalautotest-1.11.3.tar.gz +/gdal-2.0.2-fedora.tar.xz +/gdalautotest-2.1.0.tar.gz +/gdal-2.1.0-fedora.tar.xz +/gdalautotest-2.1.1.tar.gz +/gdal-2.1.1-fedora.tar.xz +/gdal-2.1.2-fedora.tar.xz +/gdalautotest-2.1.3.tar.gz +/gdal-2.1.3-fedora.tar.xz +/gdal-2.1.4-fedora.tar.xz +/gdalautotest-2.1.4.tar.gz +/gdal-2.2.2-fedora.tar.xz +/gdalautotest-2.2.2.tar.gz +/gdalautotest-2.2.3.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 +/gdal-3.1.0-fedora.tar.xz +/gdalautotest-3.1.0.tar.gz +/gdal-3.1.1-fedora.tar.xz +/gdalautotest-3.1.1.tar.gz +/gdal-3.1.2-fedora.tar.xz +/gdalautotest-3.1.2.tar.gz +/gdal-3.1.3-fedora.tar.xz +/gdalautotest-3.1.3.tar.gz +/gdal-3.1.4-fedora.tar.xz +/gdalautotest-3.1.4.tar.gz +/gdalautotest-3.2.0.tar.gz +/gdal-3.2.0-fedora.tar.xz +/gdal-3.2.1-fedora.tar.xz +/gdalautotest-3.2.1.tar.gz +/gdalautotest-3.2.2.tar.gz +/gdal-3.2.2-fedora.tar.xz +/gdalautotest-3.3.0.tar.gz +/gdal-3.3.0-fedora.tar.xz +/gdal-3.3.1-fedora.tar.xz +/gdalautotest-3.3.1.tar.gz +/gdal-3.3.2-fedora.tar.xz +/gdalautotest-3.3.2.tar.gz +/gdal-3.3.3-fedora.tar.xz +/gdalautotest-3.3.3.tar.gz +/gdal-3.4.0-fedora.tar.xz +/gdalautotest-3.4.0.tar.gz +/gdal-3.4.1-fedora.tar.xz +/gdalautotest-3.4.1.tar.gz +/gdal-3.4.2-fedora.tar.xz +/gdalautotest-3.4.2.tar.gz +/gdal-3.4.3-fedora.tar.xz +/gdalautotest-3.4.3.tar.gz +/gdalautotest-3.5.0.tar.gz +/gdal-3.5.0-fedora.tar.xz +/gdalautotest-3.5.1.tar.gz +/gdal-3.5.1-fedora.tar.xz +/gdal-3.5.2-fedora.tar.xz +/gdalautotest-3.5.2.tar.gz +/gdal-3.5.3-fedora.tar.xz +/gdalautotest-3.5.3.tar.gz +/gdal-3.6.0-fedora.tar.xz +/gdalautotest-3.6.0.tar.gz +/gdalautotest-3.6.1.tar.gz +/gdal-3.6.1.tar.xz +/gdal-3.6.1-fedora.tar.xz +/gdal-3.6.2-fedora.tar.xz +/gdalautotest-3.6.2.tar.gz +/gdal-3.6.3-fedora.tar.xz +/gdalautotest-3.6.3.tar.gz +/gdal-3.6.4-fedora.tar.xz +/gdalautotest-3.6.4.tar.gz +/gdal-3.7.0-fedora.tar.xz +/gdalautotest-3.7.0.tar.gz +/gdal-3.7.1-fedora.tar.xz +/gdalautotest-3.7.1.tar.gz +/gdal-3.7.2-fedora.tar.xz +/gdalautotest-3.7.2.tar.gz +/gdal-3.7.3-fedora.tar.xz +/gdalautotest-3.7.3.tar.gz +/gdal-3.8.0-fedora.tar.xz +/gdalautotest-3.8.0.tar.gz +/gdal-3.8.1-fedora.tar.xz +/gdalautotest-3.8.1.tar.gz +/gdal-3.8.2-fedora.tar.xz +/gdalautotest-3.8.2.tar.gz +/gdal-3.8.3-fedora.tar.xz +/gdalautotest-3.8.3.tar.gz +/gdal-3.8.4-fedora.tar.xz +/gdalautotest-3.8.4.tar.gz +/gdal-3.8.5-fedora.tar.xz +/gdalautotest-3.8.5.tar.gz +/gdal-3.9.0-fedora.tar.xz +/gdalautotest-3.9.0.tar.gz +/gdal-3.9.1-fedora.tar.xz +/gdalautotest-3.9.1.tar.gz +/gdal-3.9.2-fedora.tar.xz +/gdalautotest-3.9.2.tar.gz +/gdalautotest-3.9.3.tar.gz +/gdal-3.9.3-fedora.tar.xz +/gdal-3.10.0-fedora.tar.xz +/gdalautotest-3.10.0.tar.gz +/gdal-3.10.1-fedora.tar.xz +/gdalautotest-3.10.1.tar.gz +/gdal-3.10.2-fedora.tar.xz +/gdalautotest-3.10.2.tar.gz +/gdal-3.10.3-fedora.tar.xz +/gdalautotest-3.10.3.tar.gz +/gdal-3.11.3-fedora.tar.xz +/gdalautotest-3.11.3.tar.gz +/gdal-3.11.4-fedora.tar.xz +/gdalautotest-3.11.4.tar.gz +/gdal-3.11.5-fedora.tar.xz +/gdalautotest-3.11.5.tar.gz +/gdal-3.12.0-fedora.tar.xz +/gdal-3.12.0.tar.xz +/gdalautotest-3.12.0.zip +/gdal-3.12.1-fedora.tar.xz +/gdalautotest-3.12.1.zip diff --git a/cpl-config.h b/cpl-config.h new file mode 100644 index 0000000..456693f --- /dev/null +++ b/cpl-config.h @@ -0,0 +1,11 @@ +#include + +#if __WORDSIZE == 32 +#include "gdal/cpl_config-32.h" +#else +#if __WORDSIZE == 64 +#include "gdal/cpl_config-64.h" +#else +#error "Unknown word size" +#endif +#endif diff --git a/gdal-1.9.0-java.patch b/gdal-1.9.0-java.patch deleted file mode 100644 index bc57be8..0000000 --- a/gdal-1.9.0-java.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gdal-1.9.0-fedora/swig/java/java.opt gdal-1.9.0-fedora-java/swig/java/java.opt ---- gdal-1.9.0-fedora/swig/java/java.opt 2012-01-04 08:03:40.000000000 +0100 -+++ gdal-1.9.0-fedora-java/swig/java/java.opt 2012-02-03 08:44:55.837978697 +0100 -@@ -5,6 +5,6 @@ - JAVAC=$(JAVA_HOME)/bin/javac - JAVA=$(JAVA_HOME)/bin/java - JAR=$(JAVA_HOME)/bin/jar --JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux - - diff --git a/gdal-1.9.0-man.patch b/gdal-1.9.0-man.patch deleted file mode 100644 index 2e1671e..0000000 --- a/gdal-1.9.0-man.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gdal-1.9.0-fedora/GNUmakefile gdal-1.9.0-fedora-man/GNUmakefile ---- gdal-1.9.0-fedora/GNUmakefile 2012-01-04 08:03:42.000000000 +0100 -+++ gdal-1.9.0-fedora-man/GNUmakefile 2012-02-22 17:29:07.565112215 +0100 -@@ -129,6 +129,7 @@ - cp frmts/wms/frmt_wms_*.xml html - cp frmts/wms/frmt_twms_*.xml html - -+.PHONY: man - man: - # Generate man pages - (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - diff --git a/gdal-1.9.1-dods-3.11.3.patch b/gdal-1.9.1-dods-3.11.3.patch deleted file mode 100644 index 5cdc90d..0000000 --- a/gdal-1.9.1-dods-3.11.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gdal-1.9.1-fedora/configure gdal-1.9.1-fedora-dods3.11.3/configure ---- gdal-1.9.1-fedora/configure 2012-05-17 05:30:56.000000000 +0200 -+++ gdal-1.9.1-fedora-dods3.11.3/configure 2012-05-20 10:47:10.032831845 +0200 -@@ -24320,8 +24320,8 @@ - as_fn_error $? "--with-dods-root requires path to dods root as argument" "$LINENO" 5 - else - DODS_LIB=$with_dods_root/lib -- DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap" - DODS_BIN=$with_dods_root/bin -+ DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap `$DODS_BIN/xml2-config --cflags`" - - rm -f islibdappost310.* - echo '#include "Connect.h"' > islibdappost310.cpp -Binary files gdal-1.9.1-fedora/.configure.swp and gdal-1.9.1-fedora-dods3.11.3/.configure.swp differ diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 8a0d644..2859e69 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,25 +1,38 @@ #!/bin/bash -# Volker Fröhlich -VERSION="1.9.2" +set -e -tar xvfz gdal-"${VERSION}".tar.gz +if [ $# -lt 1 ]; then + echo "Usage: $0 version pre" + exit 1 +fi -mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora +VERSION="$1" +PRE="$2" -rm data/cubewerx_extra.wkt -rm data/esri_extra.wkt -rm data/esri_Wisconsin_extra.wkt -rm data/esri_StatePlane_extra.wkt -rm data/ecw_cs.wkt +if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then + wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz +fi -rm -r frmts/bsb +if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then + echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script" + exit 1 +fi -#Really necessary? -rm -r swig/php +tar xvf gdal-"${VERSION}${PRE}".tar.xz +mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora + +rm ogr/data/cubewerx_extra.wkt +rm ogr/data/esri_StatePlane_extra.wkt +rm ogr/data/ecw_cs.wkt + + +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt popd #TODO: Insert Provenance file -tar cvfz gdal-"${VERSION}"-fedora.tar.gz gdal-"${VERSION}"-fedora +tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora diff --git a/gdal-config b/gdal-config new file mode 100755 index 0000000..0a258a7 --- /dev/null +++ b/gdal-config @@ -0,0 +1,11 @@ +#!/bin/bash + +ARCH=$(uname -m) +case $ARCH in +x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 ) +gdal-config-64 ${*} +;; +*) +gdal-config-32 ${*} +;; +esac diff --git a/gdal-g2clib.patch b/gdal-g2clib.patch deleted file mode 100644 index c53c78e..0000000 --- a/gdal-g2clib.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c.g2clib gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c ---- gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c.g2clib 2012-01-04 00:03:34.000000000 -0700 -+++ gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/engribapi.c 2012-03-09 12:54:58.582531620 -0700 -@@ -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++) { -diff -up gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c.g2clib gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c ---- gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c.g2clib 2012-01-04 00:03:34.000000000 -0700 -+++ gdal-1.9.0-fedora/frmts/grib/degrib18/degrib/grib2api.c 2012-03-09 12:55:38.686097396 -0700 -@@ -958,7 +958,6 @@ void unpk_g2ncep (sInt4 * kfildo, float - } - 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]); - } -@@ -1026,7 +1025,6 @@ void unpk_g2ncep (sInt4 * kfildo, float - } - 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]); - } -@@ -1044,7 +1042,6 @@ void unpk_g2ncep (sInt4 * kfildo, float - } - 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]); - } -diff -up gdal-1.9.0-fedora/frmts/grib/GNUmakefile.g2clib gdal-1.9.0-fedora/frmts/grib/GNUmakefile ---- gdal-1.9.0-fedora/frmts/grib/GNUmakefile.g2clib 2012-01-04 00:03:34.000000000 -0700 -+++ gdal-1.9.0-fedora/frmts/grib/GNUmakefile 2012-03-09 12:05:14.050311275 -0700 -@@ -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 ($(HAVE_JASPER),yes) - EXTRAFLAGS := $(EXTRAFLAGS) -DHAVE_JASPER diff --git a/gdal-jni.patch b/gdal-jni.patch deleted file mode 100644 index edb266e..0000000 --- a/gdal-jni.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i ---- gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i 2013-06-12 14:40:22.858828066 -0600 -@@ -22,7 +22,7 @@ - - static { - try { -- System.loadLibrary("gdalconstjni"); -+ System.load("/usr/lib/java/gdal/libgdalconstjni.so"); - available = true; - } catch (UnsatisfiedLinkError e) { - available = false; -diff -up gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdal_java.i ---- gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/gdal_java.i 2013-06-12 14:40:39.142749339 -0600 -@@ -22,7 +22,7 @@ - - static { - try { -- System.loadLibrary("gdaljni"); -+ System.load("/usr/lib/java/gdal/libgdaljni.so"); - available = true; - - if (gdal.HasThreadSupport() == 0) -diff -up gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni gdal-1.9.2-fedora/swig/include/java/ogr_java.i ---- gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/ogr_java.i 2013-06-12 14:39:47.946997388 -0600 -@@ -24,7 +24,7 @@ - - static { - try { -- System.loadLibrary("ogrjni"); -+ System.load("/usr/lib/java/gdal/libogrjni.so"); - available = true; - - if (org.gdal.gdal.gdal.HasThreadSupport() == 0) -diff -up gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni gdal-1.9.2-fedora/swig/include/java/osr_java.i ---- gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/osr_java.i 2013-06-12 14:41:10.097554983 -0600 -@@ -26,7 +26,7 @@ - - static { - try { -- System.loadLibrary("osrjni"); -+ System.load("/usr/lib/java/gdal/libosrjni.so"); - available = true; - } catch (UnsatisfiedLinkError e) { - available = false; diff --git a/gdal.pom b/gdal.pom deleted file mode 100644 index 95bf86f..0000000 --- a/gdal.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - org.gdal - gdal-java-bindings - - diff --git a/gdal.spec b/gdal.spec index 6760d86..3cb8526 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,138 +1,11 @@ -#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 -#TODO: e00compr bundled? -#TODO: There are tests for bindings -- at least for Perl -#TODO: Java has a directory with test data and a build target called test -# It uses %{JAVA_RUN}; make test seems to work in the build directory -#TODO: e00compr source is the same in the package and bundled in GDAL -#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO +# Without this the build time baloons from 1 hour to more than 46 on i686 +# https://bugzilla.redhat.com/show_bug.cgi?id=2390105 +%undefine _preserve_static_debuginfo +%define _find_debuginfo_opts --no-ar-files -# Soname should be bumped on API/ABI break -# http://trac.osgeo.org/gdal/ticket/4543 +%global run_tests 1 -# 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 - -#TODO: EvenR suggested to drop Ruby bindings, as they are unmaintained -# He also suggest to use --with-static-proj4 to actually link to proj, instead of dlopen()ing it. - - -# Tests can be of a different version -%global testversion 1.9.0 - -# https://bugzilla.redhat.com/show_bug.cgi?id=663938 -%ifnarch ppc ppc64 -%global spatialite "--with-spatialite" -%endif - - -Name: gdal -Version: 1.9.2 -Release: 7%{?dist} -Summary: GIS file format library -Group: System Environment/Libraries -License: MIT -URL: http://www.gdal.org -# Source0: http://download.osgeo.org/gdal/gdal-%%{version}.tar.gz -# See PROVENANCE.TXT-fedora and the cleaner script for details! - -Source0: %{name}-%{version}-fedora.tar.gz -Source1: http://download.osgeo.org/%{name}/%{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 - -Patch4: %{name}-1.9.1-dods-3.11.3.patch - -# Fedora uses Alternatives for Java -Patch8: %{name}-1.9.0-java.patch - -# Make man a phony buildtarget; the directory otherwise blocks it -# Should be solved in 2.0 -Patch9: %{name}-1.9.0-man.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: ant -# No armadillo in EL5 -BuildRequires: armadillo-devel -BuildRequires: cfitsio-devel -# No CharLS in EL5 -BuildRequires: CharLS-devel -BuildRequires: chrpath -BuildRequires: curl-devel -BuildRequires: doxygen -BuildRequires: expat-devel -BuildRequires: fontconfig-devel -# No freexl in EL5 -BuildRequires: freexl-devel -BuildRequires: g2clib-static -BuildRequires: geos-devel -BuildRequires: ghostscript -BuildRequires: hdf-devel -BuildRequires: hdf-static -BuildRequires: hdf5-devel -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jasper-devel -BuildRequires: jpackage-utils -BuildRequires: libgcj -BuildRequires: libgeotiff-devel -# No libgta in EL5 -BuildRequires: libgta-devel - -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel - -%ifnarch ppc ppc64 -BuildRequires: libspatialite-devel -%endif - -BuildRequires: libtiff-devel -BuildRequires: libwebp-devel -BuildRequires: libtool -BuildRequires: giflib-devel -BuildRequires: netcdf-devel -BuildRequires: libdap-devel -BuildRequires: librx-devel -BuildRequires: mysql-devel -BuildRequires: numpy -#BuildRequires: ogdi-devel -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: pkgconfig -BuildRequires: poppler-devel -BuildRequires: postgresql-devel -BuildRequires: proj-devel -BuildRequires: python-devel -BuildRequires: ruby -BuildRequires: ruby-devel -BuildRequires: sqlite-devel -BuildRequires: swig -BuildRequires: tetex-latex -BuildRequires: unixODBC-devel -BuildRequires: xerces-c-devel -BuildRequires: xz-devel -BuildRequires: zlib-devel - -# Run time dependency for gpsbabel driver -Requires: gpsbabel - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -# Enable/disable generating refmans -%global build_refman 1 +%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) # We have multilib triage %if "%{_lib}" == "lib" @@ -141,17 +14,239 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %global cpuarch 64 %endif -%if ! (0%{?fedora} > 12 || 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))")} + +%if 0%{?bootstrap} +%global with_mysql 0 +%global mysql --without-mysql +%global with_poppler 0 +%global poppler --without-poppler +%global with_spatialite 0 +%global spatialite --without-spatialite +%else +# https://bugzilla.redhat.com/show_bug.cgi?id=1490492 +%global with_mysql 1 +%global mysql --with-mysql +# https://bugzilla.redhat.com/show_bug.cgi?id=1490492 +%global with_poppler 1 +%global poppler --with-poppler +%global with_spatialite 1 +%global spatialite "--with-spatialite" %endif -%if (0%{?fedora} < 17 || 0%{?rhel}) -# https://fedoraproject.org/wiki/PackagingDrafts/Ruby -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} +%if 0%{?fedora} +%bcond_without mingw +%bcond_without python3 +%ifarch %{java_arches} +%bcond_without java +%else +%bcond_with java +%endif +%else +%bcond_with mingw +%bcond_with python3 +%bcond_with java %endif -#TODO: Description on the lib? +#global pre beta1 + + +Name: gdal +Version: 3.12.1 +Release: 1%{?dist} +Summary: GIS file format library +License: MIT +URL: http://www.gdal.org +# Source0: http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz +# See PROVENANCE.TXT-fedora and the cleaner script for details! + +Source0: %{name}-%{version}%{?pre:%pre}-fedora.tar.xz +Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.zip +# Multilib compatible cpl-config.h header +Source2: cpl-config.h +# Multilib compatible gdal-config script +Source3: gdal-config +Source4: PROVENANCE.TXT-fedora + +# Cleaner script for the tarball +Source5: %{name}-cleaner.sh + +# Add some utils to the default install target +Patch0: gdal_utils.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ + +BuildRequires: bison +BuildRequires: curl-devel +BuildRequires: expat-devel +BuildRequires: geos-devel +BuildRequires: json-c-devel +BuildRequires: libarchive-devel +BuildRequires: libpng-devel +BuildRequires: libpq-devel +BuildRequires: libtiff-devel +BuildRequires: libtirpc-devel +BuildRequires: mariadb-connector-c-devel +BuildRequires: openjpeg2-devel +BuildRequires: pcre2-devel +BuildRequires: proj-devel >= 5.2.0 +BuildRequires: sqlite-devel +BuildRequires: swig +BuildRequires: unixODBC-devel +BuildRequires: unzip +BuildRequires: xz-devel +BuildRequires: zlib-devel + +%if 0%{?fedora} +# Fedora dependencies +BuildRequires: armadillo-devel +BuildRequires: blosc-devel +BuildRequires: cfitsio-devel +BuildRequires: CharLS-devel +BuildRequires: freexl-devel +BuildRequires: giflib-devel +BuildRequires: gtest-devel +BuildRequires: hdf-devel +BuildRequires: hdf5-devel +%ifnarch %{ix86} %{arm} +BuildRequires: libarrow-devel +BuildRequires: libarrow-dataset-devel +%endif +BuildRequires: libdap-devel +BuildRequires: libdeflate-devel +BuildRequires: libgeotiff-devel +BuildRequires: libgta-devel +BuildRequires: libjpeg-devel +BuildRequires: libkml-devel +BuildRequires: liblerc-devel +%if %{with_spatialite} +BuildRequires: libspatialite-devel +%endif +BuildRequires: libwebp-devel +BuildRequires: libzstd-devel +%if 0%{?with_mysql} +BuildRequires: mariadb-connector-c-devel +%endif +BuildRequires: muParser-devel +BuildRequires: netcdf-devel +BuildRequires: openexr-devel +BuildRequires: openssl-devel-engine +%ifnarch %{ix86} %{arm} +BuildRequires: parquet-libs-devel +%endif +%if 0%{?with_poppler} +BuildRequires: poppler-devel +%endif +BuildRequires: qhull-devel +BuildRequires: xerces-c-devel +%else +# RHEL dependencies +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel +%endif + +# Python +%if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-filelock +BuildRequires: python3-numpy +BuildRequires: python3-setuptools +BuildRequires: python3dist(pytest) >= 3.6 +BuildRequires: python3dist(lxml) >= 4.5.1 +%endif + +# Java +%if %{with java} +# For 'mvn_artifact' and 'mvn_install' +BuildRequires: ant-openjdk25 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local-openjdk25 +BuildRequires: jpackage-utils +%endif + +# MinGW +%if %{with mingw} +BuildRequires: mingw32-filesystem +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw32-cfitsio +BuildRequires: mingw32-curl +BuildRequires: mingw32-dlfcn +BuildRequires: mingw32-expat +BuildRequires: mingw32-freexl +BuildRequires: mingw32-geos +BuildRequires: mingw32-giflib +BuildRequires: mingw32-json-c +BuildRequires: mingw32-libarchive +BuildRequires: mingw32-libgeotiff +BuildRequires: mingw32-libgta +BuildRequires: mingw32-libjpeg-turbo +BuildRequires: mingw32-libkml +BuildRequires: mingw32-liblerc +BuildRequires: mingw32-libpng +BuildRequires: mingw32-libspatialite +BuildRequires: mingw32-libtiff +BuildRequires: mingw32-libwebp +BuildRequires: mingw32-openexr +BuildRequires: mingw32-openjpeg2 +BuildRequires: mingw32-pcre2 +BuildRequires: mingw32-poppler +BuildRequires: mingw32-postgresql +BuildRequires: mingw32-proj +BuildRequires: mingw32-sqlite +BuildRequires: mingw32-xerces-c +BuildRequires: mingw32-xz-libs +BuildRequires: mingw32-zlib +BuildRequires: mingw32-zstd +%if %{with python3} +BuildRequires: mingw32-python3 +BuildRequires: mingw32-python3-numpy +BuildRequires: mingw32-python3-setuptools +%endif + +BuildRequires: mingw64-filesystem +BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw64-cfitsio +BuildRequires: mingw64-curl +BuildRequires: mingw64-dlfcn +BuildRequires: mingw64-expat +BuildRequires: mingw64-freexl +BuildRequires: mingw64-geos +BuildRequires: mingw64-giflib +BuildRequires: mingw64-json-c +BuildRequires: mingw64-libarchive +BuildRequires: mingw64-libgeotiff +BuildRequires: mingw64-libgta +BuildRequires: mingw64-libjpeg-turbo +BuildRequires: mingw64-libkml +BuildRequires: mingw64-liblerc +BuildRequires: mingw64-libpng +BuildRequires: mingw64-libspatialite +BuildRequires: mingw64-libtiff +BuildRequires: mingw64-libwebp +BuildRequires: mingw64-openexr +BuildRequires: mingw64-openjpeg2 +BuildRequires: mingw64-pcre2 +BuildRequires: mingw64-poppler +BuildRequires: mingw64-postgresql +BuildRequires: mingw64-proj +BuildRequires: mingw64-sqlite +BuildRequires: mingw64-xerces-c +BuildRequires: mingw64-xz-libs +BuildRequires: mingw64-zlib +BuildRequires: mingw64-zstd +%if %{with python3} +BuildRequires: mingw64-python3 +BuildRequires: mingw64-python3-numpy +BuildRequires: mingw64-python3-setuptools +%endif +%endif + +%if 0%{?fedora} +Requires: gpsbabel +%endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + + %description Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform C++ translator library for raster and vector geospatial data formats. @@ -164,644 +259,1606 @@ 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 +Summary: Development files for the GDAL file format library +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel This package contains development files for GDAL. %package libs -Summary: GDAL file format library -Group: System Environment/Libraries +Summary: GDAL file format library +# See frmts/grib/degrib/README.TXT +Provides: bundled(g2lib) = 1.6.0 +Provides: bundled(degrib) = 2.14 %description libs This package contains the GDAL file format library. -%package ruby -Summary: Ruby modules for the GDAL file format library -Group: Development/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%if (0%{?fedora} < 17 || 0%{?rhel}) -Requires: ruby(abi) = 1.8 -%else -%if 0%{?fedora} < 19 -Requires: ruby(abi) = 1.9.1 -%else -Requires: ruby(release) -%endif -%endif - -%description ruby -The GDAL Ruby modules provide support to handle multiple GIS file formats. - - +%if %{with java} %package java -Summary: Java modules for the GDAL file format library -Group: Development/Libraries -Requires: java >= 1:1.6.0 -Requires: jpackage-utils -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Java modules for the GDAL file format library +Requires: jpackage-utils +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description java 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 +Summary: Javadocs for %{name} +Requires: jpackage-utils +BuildArch: noarch %description javadoc This package contains the API documentation for %{name}. +%endif -%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)) +%if %{with python3} +%package -n python3-gdal +%{?python_provide:%python_provide python3-gdal} +Summary: Python modules for the GDAL file format library +Requires: python3-numpy +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description perl -The GDAL Perl modules provide support to handle multiple GIS file formats. +%description -n python3-gdal +The GDAL Python 3 modules provide support to handle multiple GIS file formats. -%package python -Summary: Python modules for the GDAL file format library -Group: Development/Libraries -Requires: numpy -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%package python-tools +Summary: Python tools for the GDAL file format library +Requires: python3-gdal -%description python -The GDAL Python modules provide support to handle multiple GIS file formats. -The package also includes a couple of useful utilities in Python. - - -%package doc -Summary: Documentation for GDAL -Group: Documentation -BuildArch: noarch - -%description doc -This package contains HTML and PDF documentation for GDAL. +%description python-tools +The GDAL Python package provides number of tools for programming and +manipulating GDAL file format library # We don't want to provide private Python extension libs -%global __provides_exclude_from ^%{python_sitearch}/.*\.so$ +%global __provides_exclude_from ^%{python3_sitearch}/.*\.so$ +%endif + + +%if %{with mingw} +%package -n mingw32-%{name} +Summary: MinGW Windows GDAL library +# GDAL bundles a modified copy of g2clib and degrib +# See frmts/grib/degrib/README.TXT +Provides: bundled(g2lib) = 1.6.0 +Provides: bundled(degrib) = 2.14 +BuildArch: noarch + +%description -n mingw32-%{name} +MinGW Windows GDAL library. + + +%package -n mingw32-%{name}-tools +Summary: MinGW Windows GDAL library tools +BuildArch: noarch + +%description -n mingw32-%{name}-tools +MinGW Windows GDAL library tools. + + +%if %{with python3} +%package -n mingw32-python3-%{name} +Summary: MinGW Windows Python3 GDAL bindings + +%description -n mingw32-python3-%{name} +MinGW Windows Python3 GDAL bindings. +%endif + + +%package -n mingw64-%{name} +Summary: MinGW Windows GDAL library +# GDAL bundles a modified copy of g2clib and degrib +# See frmts/grib/degrib/README.TXT +Provides: bundled(g2lib) = 1.6.0 +Provides: bundled(degrib) = 2.14 +BuildArch: noarch + +%description -n mingw64-%{name} +MinGW Windows GDAL library. + + +%package -n mingw64-%{name}-tools +Summary: MinGW Windows GDAL library tools +BuildArch: noarch + +%description -n mingw64-%{name}-tools +MinGW Windows GDAL library tools. + + +%if %{with python3} +%package -n mingw64-python3-%{name} +Summary: MinGW Windows Python3 GDAL bindings + +%description -n mingw64-python3-%{name} +MinGW Windows Python3 GDAL bindings. +%endif + +%{?mingw_debug_package} +%endif %prep -%setup -q -n %{name}-%{version}-fedora - -# Unpack tests to the same directory -%setup -q -D -a 1 -n %{name}-%{version}-fedora +%autosetup -N -p1 -n %{name}-%{version}%{?pre:%pre}-fedora # Delete bundled libraries -rm -rf frmts/zlib +# rm -rf frmts/zlib rm -rf frmts/png/libpng rm -rf frmts/gif/giflib -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 +rm -rf frmts/jpeg/libjpeg +rm -rf frmts/jpeg/libjpeg12 +rm -rf frmts/gtiff/libgeotiff +# FIXME: frmts/libertiff/libtiff_codecs.h requires tif_lzw.c, tif_packbits.c, tif_lerc.c +# rm -rf frmts/gtiff/libtiff +rm -rf mrf/LERCV1 +rm -rf third_party/LercLib -%patch1 -p1 -b .g2clib~ -%patch2 -p1 -b .jni~ -%patch4 -p1 -b .dods~ -%patch8 -p1 -b .java~ -%patch9 -p1 -b .man~ +# Setup autotest directory +unzip %{SOURCE1} +mv %{name}autotest-%{version}%{?pre:%pre} autotest + +# Need to patch autotest +%autopatch -p1 # Copy in PROVENANCE.TXT-fedora -cp %SOURCE4 . - -# 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 - -# Workaround about wrong result in configure -# armadillo returns a warning about gcc versions 4.7.0 or 4.7.1 -# due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549 -# configure interprets the result as an error so ignore it -# this patch can/should be removed after gcc 4.7.2 is released -sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if true|' configure - -# Build with fPIC to allow Ruby bindings -# Xcompiler should normally achieve that -- http://trac.osgeo.org/gdal/ticket/3978 -# http://trac.osgeo.org/gdal/ticket/1994 -sed -i 's|\$(CFLAGS)|$(CFLAGS) -fPIC|g' swig/ruby/RubyMakefile.mk - -%if !(0%{?fedora} < 17 || 0%{?rhel}) -# Install Ruby bindings to distribution specific directory -sed -i 's|RUBY_EXTENSIONS_DIR :=.*|RUBY_EXTENSIONS_DIR := %{ruby_vendorarchdir}|' swig/ruby/RubyMakefile.mk -%endif - -# Install Ruby bindings into the proper place -#TODO: Ticket -sed -i -e 's|^$(INSTALL_DIR):|$(DESTDIR)$(INSTALL_DIR):|' swig/ruby/RubyMakefile.mk -sed -i -e 's|^install: $(INSTALL_DIR)|install: $(DESTDIR)$(INSTALL_DIR)|' swig/ruby/RubyMakefile.mk - -# 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.0|g' ogr/ogrct.cpp - -# Fix Python installation path -sed -i 's|setup.py install|setup.py install --root=%{buildroot}|' swig/python/GNUmakefile - -# Must be corrected for 64 bit architectures other than Intel -# http://trac.osgeo.org/gdal/ticket/4544 -# Should be gone in 2.0 -sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' configure - -# 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 -%endif - -# Activate support for JPEGLS -sed -i 's|^#HAVE_CHARLS|HAVE_CHARLS|' GDALmake.opt.in -sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in -sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in - -# Replace default plug-in dir -# Solved in 2.0 -# http://trac.osgeo.org/gdal/ticket/4444 -%if %cpuarch == 64 - sed -i 's|GDAL_PREFIX "/lib/gdalplugins"|GDAL_PREFIX "/lib64/gdalplugins"|' \ - gcore/gdaldrivermanager.cpp \ - ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp -%endif - -# Remove man dir, as it blocks a build target. -# It obviously slipped into the tarball and is not in Trunk (April 17th, 2011) -#rm -rf man +cp -a %{SOURCE4} . %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" +%cmake \ + -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ + -DGDAL_USE_EXTERNAL_LIB=ON \ + -DGDAL_USE_INTERNAL_LIBS=OFF \ +%if %{with java} + -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ + -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ %endif -export CXXFLAGS="$CFLAGS -I%{_includedir}/libgeotiff" -export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff" +%if ! 0%{?fedora} + -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ + -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF \ + -DBUILD_TESTING=OFF +%endif +%cmake_build -# For future reference: -# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024 -# openjpeg 2.0 necessary, 1.4 is in Fedora -# Building without pgeo driver, because it drags in Java - -%configure \ - LIBS=-lgrib2c \ - --with-autoload=%{_libdir}/%{name}plugins \ - --datadir=%{_datadir}/%{name}/ \ - --includedir=%{_includedir}/%{name}/ \ - --prefix=%{_prefix} \ - --without-bsb \ - --with-armadillo \ - --with-curl \ - --with-cfitsio=%{_prefix} \ - --with-dods-root=%{_prefix} \ - --with-expat \ - --with-freexl \ - --with-geos \ - --with-geotiff=external \ - --with-gif \ - --with-gta \ - --with-hdf4 \ - --with-hdf5 \ - --with-jasper \ - --with-java \ - --with-jpeg \ - --without-jpeg12 \ - --with-liblzma \ - --with-libtiff=external \ - --with-libz \ - --without-mdb \ - --with-mysql \ - --with-netcdf \ - --with-odbc \ - --without-ogdi \ - --without-msg \ - --without-openjpeg \ - --with-pcraster \ - --with-pg \ - --with-png \ - --with-poppler \ - %{spatialite} \ - --with-sqlite3 \ - --with-threads \ - --with-webp \ - --with-xerces \ - --enable-shared \ - --with-ruby \ - --with-perl \ - --with-python - - #--with-rasdaman # 8.3 rasdaman has no -lcompression; doesn't work - -# {?_smp_mflags} doesn't work; Or it does -- who knows! -make %{?_smp_mflags} -make man -make docs - -# Make Perl modules -pushd swig/perl - perl Makefile.PL; make; - echo > Makefile.PL; -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 - ./make_doc.sh -popd - -# --------- Documentation ---------- - -# 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|^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 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 +%if %{with mingw} +%mingw_cmake \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ + -DGDAL_USE_EXTERNAL_LIB=ON \ + -DGDAL_USE_INTERNAL_LIBS=OFF +%mingw_make_build +%endif %install -rm -rf %{buildroot} +%cmake_install -make DESTDIR=%{buildroot} \ - install \ - install-man +%if %{with mingw} +%mingw_make_install +# Delete data from cross packages +rm -r %{buildroot}%{mingw32_datadir} +rm -r %{buildroot}%{mingw64_datadir} +%endif -# Directory for auto-loading plugins -mkdir -p %{buildroot}%{_libdir}/%{name}plugins - -#TODO: Don't do that? -find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \; - -# 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 '{}' \; - -#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}/ 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}|' %{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 -# What is linked here? -mkdir -p %{buildroot}%{_jnidir}/%{name} -cp -pl swig/java/.libs/*.so* \ - %{buildroot}%{_jnidir}/%{name}/ -chrpath --delete %{buildroot}%{_jnidir}/%{name}/*jni.so* - -# Install Java API documentation in the designated place -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr swig/java/java/org %{buildroot}%{_javadocdir}/%{name} - -# Install refmans -for docdir in %{docdirs}; do - pushd $docdir - 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 - -# Install formats documentation -for dir in gdal_frmts ogrsf_frmts; do - mkdir -p $dir - find frmts -name "*.html" -exec install -p -m 644 '{}' $dir \; -done - -#TODO: Header date lost during installation -# Install multilib cpl_config.h bz#430894 -install -p -D -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h -# Create universal multilib cpl_config.h bz#341231 -# The problem is still there in 1.9. -#TODO: Ticket? - -#>>>>>>>>>>>>> -cat > %{buildroot}%{_includedir}/%{name}/cpl_config.h < - -#if __WORDSIZE == 32 -#include "gdal/cpl_config-32.h" -#else -#if __WORDSIZE == 64 -#include "gdal/cpl_config-64.h" -#else -#error "Unknown word size" -#endif -#endif -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 <>>>>>>>>>>>> -cat > %{buildroot}%{_bindir}/%{name}-config < - 3.12.1-1 +- Update to 3.12.1 + +* Mon Dec 08 2025 Sandro Mani - 3.12.0-2 +- Rebuild (libtiff) + +* Sun Nov 16 2025 Sandro Mani - 3.12.0-1 +- Update to 3.12.0 + +* Fri Nov 07 2025 Sandro Mani - 3.11.5-1 +- Update to 3.11.5 + +* Wed Oct 29 2025 Stephen Gallagher - 3.11.4-6 +- Rebuild for libarrow 22 + +* Thu Oct 09 2025 Yaakov Selkowitz - 3.11.4-5 +- Rebuilt for java-25-openjdk as system jdk + +* Fri Sep 19 2025 Python Maint - 3.11.4-4 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Thu Sep 18 2025 Yaakov Selkowitz - 3.11.4-3 +- Package manpages and shell completions together with the respective commands + +* Wed Sep 17 2025 Sandro Mani - 3.11.4-2 +- BR: muparser-devel + +* Sun Sep 14 2025 Sandro Mani - 3.11.4-1 +- Update to 3.11.4 + +* Fri Aug 22 2025 Orion Poplawski - 3.11.3-7 +- Rebuild for netcdf 4.9.3 soname bump + +* Fri Aug 22 2025 Orion Poplawski - 3.11.3-6 +- Rebuild for netcdf 4.9.3 soname bump + +* Thu Aug 21 2025 Orion Poplawski - 3.11.3-5 +- Undefine _preserve_static_debuginfo to prevent huge build times + +* Mon Aug 18 2025 Python Maint - 3.11.3-4 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Wed Aug 13 2025 Orion Poplawski - 3.11.3-3 +- Rebuild for libarrow 21 + +* Thu Jul 31 2025 Sandro Mani - 3.11.3-2 +- Rebuild (mingw-poppler) + +* Sun Jul 27 2025 Sandro Mani - 3.11.3-1 +- Update to 3.11.3 + +* Wed Jul 23 2025 Fedora Release Engineering - 3.10.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jul 18 2025 Sandro Mani - 3.10.3-5 +- Rebuild (poppler) + +* Thu Jul 10 2025 Stephen Gallagher - 3.10.3-4 +- Rebuilt for libarrow 20 + +* Tue Jun 03 2025 Python Maint - 3.10.3-3 +- Rebuilt for Python 3.14 + +* Fri May 16 2025 Sandro Mani - 3.10.3-2 +- Fix *.py scripts packaging + +* Mon Apr 07 2025 Sandro Mani - 3.10.3-1 +- Update to 3.10.3 + +* Thu Feb 27 2025 Laurențiu Nicola - 3.10.2-5 +- Enable blosc + +* Wed Feb 26 2025 Sandro Mani - 3.10.2-4 +- Rebuild (poppler) + +* Thu Feb 20 2025 Marek Kasik - 3.10.2-3 +- Add definitions of missing int16_t and int32_t + +* Thu Feb 20 2025 Marek Kasik - 3.10.2-2 +- Rebuild for libarrow 19 in poppler's sidetag + +* Sat Feb 15 2025 Sandro Mani - 3.10.2-1 +- Update to 3.10.2 + +* Fri Feb 14 2025 Benjamin A. Beasley - 3.10.1-4 +- Rebuilt for libarrow 19 + +* Tue Feb 11 2025 Sandro Mani - 3.10.1-3 +- Rebuild (poppler) + +* Thu Jan 16 2025 Fedora Release Engineering - 3.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 14 2025 Sandro Mani - 3.10.1-1 +- Update to 3.10.1 + +* Wed Nov 27 2024 Richard W.M. Jones - 3.10.0-4 +- Rebuild for libarrow 18 + +* Wed Nov 20 2024 Sandro Mani - 3.10.0-3 +- Drop fedora conditional for gpsbabel requires + +* Tue Nov 19 2024 Sandro Mani - 3.10.0-2 +- Require gpsbabel only on Fedora + +* Wed Nov 06 2024 Sandro Mani - 3.10.0-1 +- Update to 3.10.0 + +* Fri Oct 25 2024 Orion Poplawski - 3.9.3-5 +- Rebuild for hdf5 1.14.5 + +* Tue Oct 22 2024 Sandro Mani - 3.9.3-4 +- Rebuild (mingw-xerces-c) + +* Mon Oct 21 2024 Pete Walter - 3.9.3-3 +- Rebuild for xerces-c 3.3 + +* Fri Oct 18 2024 Pete Walter - 3.9.3-2 +- Rebuild for xerces-c 3.3 + +* Tue Oct 15 2024 Sandro Mani - 3.9.3-1 +- Update to 3.9.3 + +* Mon Sep 16 2024 Sandro Mani - 3.9.2-4 +- Rebuild (proj) + +* Fri Aug 23 2024 Sandro Mani - 3.9.2-3 +- Rebuild (mingw-poppler) + +* Thu Aug 22 2024 Marek Kasik - 3.9.2-2 +- Rebuild for poppler 24.08.0 + +* Sat Aug 17 2024 Sandro Mani - 3.9.2-1 +- Update to 3.9.2 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 26 2024 Sandro Mani - 3.9.1-1 +- Update to 3.9.1 + +* Sun Jun 09 2024 Python Maint - 3.9.0-4 +- Rebuilt for Python 3.13 + +* Wed May 15 2024 Sandro Mani - 3.9.0-3 +- Rebuild (libarrow) + +* Tue May 14 2024 Sandro Mani - 3.9.0-2 +- BR: libarrow-dataset-devel + +* Sat May 11 2024 Sandro Mani - 3.9.0-1 +- Update to 3.9.0 + +* Wed Apr 24 2024 Benjamin A. Beasley - 3.8.5-4 +- Rebuilt for openexr 3.2.4 + +* Tue Apr 23 2024 Sandro Mani - 3.8.5-3 +- Rebuild (libarrow) + +* Sun Apr 14 2024 Sandro Mani - 3.8.5-2 +- BR: parquet-libs-devel + +* Mon Apr 08 2024 Sandro Mani - 3.8.5-1 +- Update to 3.8.5 + +* Thu Mar 21 2024 Sandro Mani - 3.8.4-5 +- Rebuild (libarrow) + +* Tue Mar 19 2024 Sandro Mani - 3.8.4-4 +- Rebuild (libarrow) + +* Tue Mar 05 2024 Sandro Mani - 3.8.4-3 +- Rebuild (proj) + +* Mon Feb 26 2024 Sandro Mani - 3.8.4-2 +- BR: libarchive + +* Sun Feb 18 2024 Sandro Mani - 3.8.4-1 +- Update to 3.8.4 + +* Fri Feb 02 2024 Sandro Mani - 3.8.3-5 +- Rebuild (poppler) + +* Sat Jan 27 2024 Sandro Mani - 3.8.3-4 +- Enable libarrow, libdeflate + +* Wed Jan 24 2024 Fedora Release Engineering - 3.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 08 2024 Sandro Mani - 3.8.3-1 +- Update to 3.8.3 + +* Thu Dec 21 2023 Sandro Mani - 3.8.2-2 +- Rebuild (armadillo) + +* Wed Dec 20 2023 Sandro Mani - 3.8.2-1 +- Update to 3.8.2 + +* Wed Dec 20 2023 Sandro Mani - 3.8.1-2 +- Rebuild (armadillo) + +* Thu Nov 30 2023 Sandro Mani - 3.8.1-1 +- Update to 3.8.1 + +* Tue Nov 14 2023 Sandro Mani - 3.8.0-1 +- Update to 3.8.0 + +* Fri Nov 03 2023 Sandro Mani - 3.7.3-1 +- Update to 3.7.3 + +* Wed Sep 13 2023 Sandro Mani - 3.7.2-1 +- Update to 3.7.2 + +* Sun Sep 03 2023 Sandro Mani - 3.7.1-7 +- Rebuild (proj) + +* Tue Aug 15 2023 Sandro Mani - 3.7.1-6 +- Rebuild (libspatialite) + +* Mon Aug 14 2023 Sandro Mani - 3.7.1-5 +- Rebuild (mingw-poppler) + +* Wed Aug 9 2023 Tom Callaway - 3.7.1-4 +- rebuild for new qhull + +* Mon Aug 07 2023 Marek Kasik - 3.7.1-3 +- Rebuild for poppler 23.08.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 18 2023 Sandro Mani - 3.7.1-1 +- Update to 3.7.1 + +* Mon Jul 03 2023 Python Maint - 3.7.0-2 +- Rebuilt for Python 3.12 + +* Thu May 11 2023 Sandro Mani - 3.7.0-1 +- Update to 3.7.0 + +* Tue May 09 2023 Markus Neteler - 3.6.4-3 +- SPDX migration + +* Tue May 02 2023 Sandro Mani - 3.6.4-2 +- Drop unused librx BR + +* Sat Apr 22 2023 Sandro Mani - 3.6.4-1 +- Update to 3.6.4 + +* Tue Mar 14 2023 Sandro Mani - 3.6.3-1 +- Update to 3.6.3 + +* Sat Mar 04 2023 Sandro Mani - 3.6.2-6 +- Rebuild (proj) + +* Tue Feb 07 2023 Sandro Mani - 3.6.2-5 +- Rebuild (mingw-poppler) + +* Sat Feb 04 2023 Sandro Mani - 3.6.2-4 +- Rebuild (poppler) + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Maxwell G - 3.6.2-2 +- Rebuild for cfitsio 4.2 + +* Thu Jan 05 2023 Sandro Mani - 3.6.2-1 +- Update to 3.6.2 + +* Mon Jan 02 2023 Sandro Mani - 3.6.1-3 +- Rebuild (mingw-cfitsio) + +* Thu Dec 29 2022 Maxwell G - 3.6.1-2 +- Rebuild for cfitsio 4.2 + +* Thu Dec 15 2022 Sandro Mani - 3.6.1-1 +- Update to 3.6.1 + +* Mon Dec 05 2022 Sandro Mani - 3.6.0-4 +- Rebuild (mingw-xerces-c) + +* Mon Dec 05 2022 Sandro Mani - 3.6.0-3 +- Switch to pcre2 for mingw build + +* Fri Nov 18 2022 Sandro Mani - 3.6.0-2 +- Rebuild (mingw-postgresql) + +* Fri Nov 11 2022 Sandro Mani - 3.6.0-1 +- Update to 3.6.0 + +* Thu Nov 03 2022 Sandro Mani - 3.6.0-0.1.rc1 +- Update to 3.6.0-rc1 + +* Thu Nov 03 2022 Sandro Mani - 3.5.3-2 +- Re-enable java + +* Tue Nov 01 2022 Sandro Mani - 3.5.3-1 +- Update to 3.5.3 + +* Wed Oct 19 2022 Sandro Mani - 3.5.2-3 +- Rebuild (python-3.11) + +* Fri Oct 7 2022 Tom Rix - 3.5.2-2 +- Add mingw build conditional +- Reduce java build condition to rhel 8 + +* Tue Sep 13 2022 Sandro Mani - 3.5.2-1 +- Update to 3.5.2 + +* Sun Sep 04 2022 Sandro Mani - 3.5.1-6 +- Rebuild (proj) + +* Tue Aug 02 2022 Sandro Mani - 3.5.1-5 +- Rebuild (poppler) + +* Wed Jul 27 2022 Sandro Mani - 3.5.1-4 +- Rebuild (liblerc) + +* Thu Jul 21 2022 Sandro Mani - 3.5.1-3 +- Rebuild (liblerc) + +* Thu Jul 21 2022 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 06 2022 Sandro Mani - 3.5.1-1 +- Update to 3.5.1 +- Limit -java subpackage to %%java_arches + +* Mon Jun 13 2022 Python Maint - 3.5.0-5 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Jitka Plesnikova - 3.5.0-4 +- Perl 5.36 rebuild + +* Sat May 21 2022 Sandro Mani - 3.5.0-3 +- Fix gdal-config take two + +* Fri May 20 2022 Sandro Mani - 3.5.0-2 +- Fix gdal-config + +* Fri May 13 2022 Sandro Mani - 3.5.0-1 +- Update to 3.5.0 + +* Wed May 04 2022 Sandro Mani - 3.4.3-1 +- Update to 3.4.3 + +* Mon Mar 14 2022 Sandro Mani - 3.4.2-1 +- Update to 3.4.2 + +* Thu Mar 10 2022 Sandro Mani - 3.4.1-6 +- Rebuild for proj-9.0.0 + +* Sun Feb 13 2022 Josef Ridky - 3.4.1-5 +- Rebuilt for libjasper.so.6 + +* Sat Feb 05 2022 Jiri Vanek - 3.4.1-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Sandro Mani - 3.4.1-2 +- Rebuild (poppler) + +* Tue Jan 04 2022 Sandro Mani - 3.4.1-1 +- Update to 3.4.1 + +* Sun Nov 21 2021 Orion Poplawski - 3.4.0-2 +- Rebuild for hdf5 1.12.1 + +* Mon Nov 08 2021 Sandro Mani - 3.4.0-1 +- Update to 3.4.0 + +* Fri Oct 29 2021 Sandro Mani - 3.3.3-1 +- Update to 3.3.3 + +* Thu Oct 21 2021 Sandro Mani - 3.3.2-3 +- Rebuild (geos) + +* Tue Sep 14 2021 Sahana Prasad - 3.3.2-2 +- Rebuilt with OpenSSL 3.0.0 + +* Tue Sep 07 2021 Sandro Mani - 3.3.2-1 +- Update to 3.3.2 + +* Tue Aug 10 2021 Orion Poplawski - 3.3.1-5 +- Rebuild for hdf5 1.10.7/netcdf 4.8.0 + +* Mon Aug 02 2021 Sandro Mani - 3.3.1-4 +- Rebuild (poppler) + +* Wed Jul 21 2021 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 3.3.1-2 +- Rebuild for versioned symbols in json-c + +* Mon Jul 05 2021 Sandro Mani - 3.3.1-1 +- Update to 3.3.1 + +* Fri Jun 04 2021 Python Maint - 3.3.0-7 +- Rebuilt for Python 3.10 + +* Mon May 24 2021 Jitka Plesnikova - 3.3.0-6 +- Perl 5.34 re-rebuild updated packages + +* Fri May 21 2021 Sandro Mani - 3.3.0-5 +- Rebuild (libgta) + +* Fri May 21 2021 Jitka Plesnikova - 3.3.0-4 +- Perl 5.34 rebuild + +* Thu May 20 2021 Richard Shaw - 3.3.0-3 +- Rebuilding for libgta 1.2.1. + +* Fri May 07 2021 Sandro Mani - 3.3.0-2 +- Rebuild (gdal) + +* Mon May 03 2021 Sandro Mani - 3.3.0-1 +- Update to 3.3.0 + +* Wed Mar 24 2021 Sandro Mani - 3.2.2-1 +- Update to 3.2.2 + +* Sun Mar 07 2021 Sandro Mani - 3.2.1-10 +- Rebuild (proj) + +* Tue Feb 23 2021 Elliott Sales de Andrade - 3.2.1-9 +- Fix compile against GEOS on s390x + +* Sat Feb 13 2021 Sandro Mani - 3.2.1-8 +- Rebuild (geos) + +* Sat Feb 13 2021 Sandro Mani - 3.2.1-7 +- Rebuild (geos) + +* Mon Feb 08 2021 Pavel Raiskup - 3.2.1-6 +- rebuild for libpq ABI fix rhbz#1908268 + +* Mon Feb 01 2021 Orion Poplawski - 3.2.1-5 +- Rebuild for cfitsio 3.490 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 11:51:40 CET 2021 Sandro Mani - 3.2.1-3 +- Rebuild (poppler) + +* Tue Jan 5 18:08:07 WET 2021 José Matos - 3.2.1-2 +- rebuild for armadillo 10 + +* Mon Jan 04 2021 Sandro Mani - 3.2.1-1 +- Update to 3.2.1 + +* Thu Nov 05 2020 Sandro Mani - 3.2.0-1 +- Update to 3.2.0 + +* Mon Nov 02 2020 Sandro Mani - 3.1.4-1 +- Update to 3.1.4 + +* Wed Oct 28 2020 Jeff Law - 3.1.3-3 +- Fix missing #include for gcc-11 + +* Fri Oct 16 21:25:24 CEST 2020 Sandro Mani - 3.1.3-2 +- Rebuild (jasper) + +* Mon Sep 07 2020 Sandro Mani - 3.1.3-1 +- Update to 3.1.3 + +* Mon Jul 27 2020 Fedora Release Engineering - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 09:48:50 GMT 2020 Sandro Mani - 3.1.2-5 +- Rebuild (poppler) + +* Thu Jul 16 2020 Jiri Vanek - 3.1.2-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jul 15 15:55:55 GMT 2020 Sandro Mani - 3.1.2-3 +- Rebuild (poppler) + +* Fri Jul 10 2020 Jiri Vanek - 3.1.2-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jul 07 2020 Sandro Mani - 3.1.2-1 +- Update to 3.1.2 + +* Tue Jun 30 2020 Sandro Mani - 3.1.1-1 +- Update to 3.1.1 + +* Sat Jun 27 2020 Jitka Plesnikova - 3.1.0-5 +- Perl 5.32 re-rebuild updated packages + +* Fri Jun 26 2020 Orion Poplawski - 3.1.0-4 +- Rebuild for hdf5 1.10.6 + +* Thu Jun 25 2020 Jitka Plesnikova - 3.1.0-3 +- Perl 5.32 rebuild + +* Tue May 26 2020 Miro Hrončok - 3.1.0-2 +- Rebuilt for Python 3.9 + +* Tue May 12 2020 Sandro Mani - 3.1.0-1 +- Update to 3.1.0 + +* Sat May 09 2020 Markus Neteler - 3.0.4-5 +* disabled JAVA and LaTeX support for EPEL8, due to (yet) missing dependencies + +* Wed Apr 22 2020 Björn Esser - 3.0.4-4 +- Re-enable annobin + +* Tue Apr 21 2020 Björn Esser - 3.0.4-3 +- Rebuild (json-c) +- Temporarily disable annobin, as it is broken + +* Tue Mar 03 2020 Sandro Mani - 3.0.4-2 +- Fix libtool wrappers installed for gdal utilities instead of actual binaries + +* Wed Feb 05 2020 Sandro Mani - 3.0.4-1 +- Update to 3.0.4 + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 18 2020 Rich Mattes - 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 - 2.3.2-15 +- F-32: rebuild against new poppler + +* Tue Sep 17 2019 Elliott Sales de Andrade - 2.3.2-14 +- Fix linkage against Proj + +* Mon Sep 16 2019 Sandro Mani - 2.3.2-13 +- Bump proj_somaj for proj 6 + +* Wed Sep 4 2019 Devrim Gündüz - 2.3.2-12 +- Rebuild for new Proj + +* Mon Aug 19 2019 Miro Hrončok - 2.3.2-11 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 01 2019 Jitka Plesnikova - 2.3.2-9 +- Perl 5.30 rebuild + +* Sat Mar 16 2019 Orion Poplawski +- Rebuild for hdf5 1.10.5 + +* Tue Feb 05 2019 Miro Hrončok - 2.3.2-7 +- Drop Python 2 subpackage for mass Python 2 packages removal + +* Mon Feb 04 2019 Pavel Raiskup - 2.3.2-6 +- modernize java packaging (PR#9) + +* Mon Feb 04 2019 Devrim Gündüz - 2.3.2-6 +- Rebuild for new GeOS and Proj + +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jan 26 2019 Marek Kasik - 2.3.2-4 +- Additional fixes for the rebuild + +* Fri Jan 25 2019 Marek Kasik - 2.3.2-3 +- Rebuild for poppler-0.73.0 + +* Thu Oct 04 2018 Pavel Raiskup - 2.3.2-2 +- Python 3 is the default Python now + +* Mon Oct 1 2018 Volker Fröhlich - 2.3.2-1 +- New upstream release + +* Mon Aug 27 2018 José Abílio Matos - 2.3.1-3 +- rebuild for armadillo soname bump (take 2) + +* Fri Aug 17 2018 José Abílio Matos - 2.3.1-2 +- rebuild for armadillo soname bump + +* Tue Aug 14 2018 Volker Fröhlich - 2.3.1-1 +- New upstream release + +* Tue Aug 14 2018 Marek Kasik - 2.2.4-10 +- Rebuild for poppler-0.67.0 + +* Wed Jul 25 2018 Devrim Gündüz - 2.2.4-9 +- Fix #1606875 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 03 2018 Petr Pisar - 2.2.4-7 +- Perl 5.28 rebuild + +* Fri Jun 29 2018 Jitka Plesnikova - 2.2.4-6 +- Perl 5.28 rebuild + +* Fri Jun 22 2018 Orion Poplawski - 2.2.4-5 +- Rebuild for libdap 3.19.1 + +* Tue Jun 19 2018 Miro Hrončok - 2.2.4-4 +- Rebuilt for Python 3.7 + +* Sat May 26 2018 Christian Dersch - 2.2.4-3 +- rebuilt for cfitsio 3.450 + +* Tue Mar 27 2018 Björn Esser - 2.2.4-2 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 + +* Mon Mar 26 2018 Volker Fröhlich - 2.2.4-1 +- New upstream release + +* Fri Mar 23 2018 Adam Williamson - 2.2.3-14 +- Rebuild for poppler 0.63.0 + +* Tue Mar 06 2018 Björn Esser - 2.2.3-13 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + +* Fri Feb 23 2018 Christian Dersch - 2.2.3-12 +- rebuilt for cfitsio 3.420 (so version bump) + +* Wed Feb 14 2018 David Tardon - 2.2.3-11 +- rebuild for poppler 0.62.0 + +* Wed Feb 14 2018 Volker Fröhlich - 2.2.3-10 +- Don't own /etc/bash_completion.d (BZ#1545012) + +* Tue Feb 13 2018 Pavel Raiskup - 2.2.3-9 +- silence some rpmlint warnings + +* Tue Feb 13 2018 Tom Hughes - 2.2.3-8 +- Add patch for bug by node-gdal tests and fixed upstream + +* Tue Feb 13 2018 Tom Hughes - 2.2.3-7 +- Use libtirpc for RPC routines + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 27 2018 Than Ngo - - 2.2.3-6 +- cleanup condition + +* Thu Dec 14 2017 Merlin Mathesius - 2.2.3-5 +- Cleanup spec file conditionals + +* Thu Dec 14 2017 Pavel Raiskup - 2.2.3-4 +- drop bootstrap mode +- build-require mariadb-connector-c-devel (rhbz#1494096) + +* Mon Dec 11 2017 Björn Esser - 2.2.3-3.1.bootstrap +- Add patch to cleanly build against json-c v0.13 + +* Sun Dec 10 2017 Björn Esser - 2.2.3-2.1.bootstrap +- Rebuilt for libjson-c.so.3 + +* Mon Dec 04 2017 Volker Froehlich - 2.2.3-1 +- New upstream release + +* Wed Nov 29 2017 Volker Froehlich - 2.2.2-2 +- Re-enable bsb format (BZ#1432330) + +* Fri Sep 22 2017 Volker Froehlich - 2.2.2-1 +- New upstream release +- Add new entries to the files sections + +* Sun Sep 17 2017 Rex Dieter - 2.1.4-11 +- rebuild (armadillo) + +* Mon Sep 11 2017 Rex Dieter - 2.1.4-10 +- support %%bootstrap mode, enable for rawhide (#1490492) +- segment POPPLER_OPTS, makes buildable on f25 + +* Fri Sep 08 2017 David Tardon - 2.1.4-9 +- rebuild for poppler 0.59.0 + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 2.1.4-8 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Orion Poplawski - 2.1.4-7 +- Handle new g2clib name in Fedora 27+ + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1.4-6 +- Python 2 binary package renamed to python2-gdal + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 David Tardon - 2.1.4-5 +- rebuild for poppler 0.57.0 + +* Wed Aug 02 2017 Fedora Release Engineering - 2.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Adam Williamson - 2.1.4-2 +- Rebuild against MariaDB 10.2 +- BuildRequires: javapackages-local, for a macro that got moved there + +* Sat Jul 01 2017 Volker Froehlich - 2.1.4-1 +- New upstream release + +* Sun Jun 04 2017 Jitka Plesnikova - 2.1.3-4 +- Perl 5.26 rebuild + +* Tue Mar 28 2017 David Tardon - 2.1.3-3 +- rebuild for poppler 0.53.0 + +* Wed Feb 01 2017 Sandro Mani - 2.1.3-2 +- Rebuild (libwebp) + +* Fri Jan 27 2017 Volker Froehlich - 2.1.3-1 +- New upstream release +- Don't run tests by default (BZ #1260151) + +* Tue Jan 24 2017 Devrim Gündüz - 2.1.2-6 +- Rebuilt for proj 4.9.3 +- Fix many rpmlint warnings/errors. +- Add a workaround for the pkg-config change in rawhide. + +* Mon Dec 19 2016 Miro Hrončok - 2.1.2-5 +- Rebuild for Python 3.6 + +* Fri Dec 16 2016 David Tardon - 2.1.2-4 +- rebuild for poppler 0.50.0 + +* Thu Dec 01 2016 Orion Poplawski - 2.1.2-3 +- Rebuild for jasper 2.0 +- Add patch to fix build with jasper 2.0 + +* Wed Nov 23 2016 David Tardon - 2.1.2-2 +- rebuild for poppler 0.49.0 + +* Sun Oct 30 2016 Volker Froehlich - 2.1.2-1 +- New upstream release + +* Sat Oct 22 2016 Orion Poplawski - 2.1.1-2 +- Use system libjson-c + +* Fri Oct 21 2016 Marek Kasik - 2.1.1-2 +- Rebuild for poppler-0.48.0 + +* Fri Aug 12 2016 Orion Poplawski - 2.1.1-1 +- Update to 2.1.1 +- Add patch to fix bash-completion installation and install it (bug #1337143) + +* Tue Jul 19 2016 Fedora Release Engineering - 2.1.0-8 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jul 18 2016 Marek Kasik - 2.1.0-7 +- Rebuild for poppler-0.45.0 + +* Tue May 17 2016 Jitka Plesnikova - 2.1.0-6 +- Perl 5.24 rebuild + +* Mon May 09 2016 Volker Froehlich - 2.1.0-5 +- Add missing BR for libkml + +* Fri May 06 2016 Sandro Mani - 2.1.0-4 +- Enable libKML support + Resolves: #1332008 + +* Tue May 03 2016 Adam Williamson - 2.1.0-3 +- rebuild for updated poppler + +* Tue May 3 2016 Marek Kasik - 2.1.0-2 +- Rebuild for poppler-0.43.0 + +* Mon May 02 2016 Jozef Mlich - 2.1.0-1 +- New upstream release + +* Mon Apr 18 2016 Tom Hughes - 2.0.2-5 +- Rebuild for libdap change Resoloves: #1328104 + +* Tue Feb 16 2016 Elliott Sales de Andrade - 2.0.2-4 +- Add Python 3 support + +* Sun Feb 14 2016 Volker Froehlich - 2.0.2-3 +- Add patch for GDAL issue #6360 + +* Mon Feb 08 2016 Volker Froehlich - 2.0.2-2 +- Rebuild for armadillo 6 + +* Thu Feb 04 2016 Volker Froehlich - 2.0.2-1 +- New upstream release +- Fix geos support (BZ #1284714) + +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Marek Kasik 2.0.1-5 +- Rebuild for poppler-0.40.0 + +* Fri Jan 15 2016 Adam Jackson 2.0.1-4 +- Rebuild for libdap soname bump + +* Mon Dec 28 2015 Igor Gnatenko - 2.0.1-3 +- Rebuilt for libwebp soname bump + +* Sun Oct 18 2015 Volker Froehlich - 2.0.1-2 +- Solve BZ #1271906 (Build iso8211 and s57 utilities) + +* Thu Sep 24 2015 Volker Froehlich - 2.0.1-1 +- Updated for 2.0.1; Add Perl module manpage + +* Wed Sep 23 2015 Orion Poplawski - 2.0.0-5 +- Rebuild for libdap 3.15.1 + +* Sun Sep 20 2015 Volker Froehlich - 2.0.0-4 +- Support openjpeg2 + +* Thu Aug 27 2015 Jonathan Wakely - 2.0.0-3 +- Rebuilt for Boost 1.59 + +* Sun Aug 09 2015 Jonathan Wakely 2.0.0-2 +- Patch to set _XOPEN_SOURCE correctly (bug #1249703) + +* Sun Jul 26 2015 Volker Froehlich - 2.0.0-1 +- Disable charls support due to build issues +- Solve a string formatting and comment errors in the Perl swig template + +* Wed Jul 22 2015 Marek Kasik - 1.11.2-12 +- Rebuild (poppler-0.34.0) + +* Fri Jul 3 2015 José Matos - 1.11.2-11 +- Rebuild for armadillo 5(.xxx.y) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.11.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 12 2015 Volker Fröhlich - 1.11.2-9 +- Rebuild for Perl's dropped module_compat_5.20.* + +* Tue Jun 09 2015 Dan Horák - 1.11.2-8 +- add upstream patch for poppler >= 31 + +* Sat Jun 06 2015 Jitka Plesnikova - 1.11.2-7 +- Perl 5.22 rebuild + +* Thu May 21 2015 Devrim Gündüz - 1.11.2-6 +- Fix proj soname in ogr/ogrct.cpp. Patch from Sandro Mani + Fixes #1212215. + +* Sun May 17 2015 Orion Poplawski - 1.11.2-5 +- Rebuild for hdf5 1.8.15 + +* Sat Apr 18 2015 Ralf Corsépius - 1.11.2-4 +- Rebuild for gcc-5.0.1 ABI changes. + +* Tue Mar 31 2015 Orion Poplawski - 1.11.2-3 +- Rebuild for g2clib fix + +* Wed Mar 11 2015 Devrim Gündüz - 1.11.2-2 +- Rebuilt for proj 4.9.1 + +* Tue Feb 17 2015 Volker Fröhlich - 1.11.2-1 +- New release +- Remove obsolete sqlite patch + +* Fri Jan 23 2015 Marek Kasik - 1.11.1-6 +- Rebuild (poppler-0.30.0) + +* Wed Jan 07 2015 Orion Poplawski - 1.11.1-5 +- Rebuild for hdf5 1.8.4 + +* Sat Dec 6 2014 Volker Fröhlich - 1.11.1-4 +- Apply upstream changeset 27949 to prevent a crash when using sqlite 3.8.7 + +* Tue Dec 2 2014 Jerry James - 1.11.1-3 +- Don't try to install perllocal.pod (bz 1161231) + +* Thu Nov 27 2014 Marek Kasik - 1.11.1-3 +- Rebuild (poppler-0.28.1) + +* Fri Nov 14 2014 Dan Horák - 1.11.1-2 +- update gdal-config for ppc64le + +* Thu Oct 2 2014 Volker Fröhlich - 1.11.1-1 +- New release +- Correct test suite source URL + +* Thu Aug 28 2014 Jitka Plesnikova - 1.11.0-9 +- Perl 5.20 rebuild + +* Mon Aug 25 2014 Devrim Gündüz - 1.11.0-7 +- Rebuilt for libgeotiff + +* Sat Aug 16 2014 Fedora Release Engineering - 1.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Aug 14 2014 Volker Fröhlich - 1.11.0-6 +- Add aarch64 to gdal-config script (BZ#1129295) + +* Fri Jul 25 2014 Peter Robinson 1.11.0-5 +- rebuild (libspatialite) + +* Mon Jul 14 2014 Orion Poplawski - 1.11.0-4 +- Rebuild for libgeotiff 1.4.0 + +* Fri Jul 11 2014 Orion Poplawski - 1.11.0-3 +- Rebuild for libdap 3.13.1 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Apr 25 2014 Volker Fröhlich - 1.11.0-1 +- New upstream release +- Remove libgcj as BR, as it no longer exists in F21 +- Re-enable ogdi and spatialite where possible +- Adapt Python-BR to python2-devel +- Obsolete Ruby bindings, due to the suggestion of Even Rouault +- Preserve timestamp of Fedora README file +- Explicitly create HTML documentation with Doxygen +- Make test execution conditional +- Truncate changelog + +* Thu Apr 24 2014 Vít Ondruch - 1.10.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + +* Fri Mar 28 2014 Michael Simacek - 1.10.1-6 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Jan 10 2014 Orion Poplawski - 1.10.1-5 +- Rebuild for armadillo soname bump + +* Wed Jan 08 2014 Orion Poplawski - 1.10.1-4 +- Rebuild for cfitsio 3.360 + +* Thu Jan 02 2014 Orion Poplawski - 1.10.1-3 +- Rebuild for libwebp soname bump + +* Sat Sep 21 2013 Orion Poplawski - 1.10.1-2 +- Rebuild to pick up atlas 3.10 changes + +* Sun Sep 8 2013 Volker Fröhlich - 1.10.1-1 +- New upstream release + +* Fri Aug 23 2013 Orion Poplawski - 1.10.0-1 +- Update to 1.10.0 +- Enable PCRE support +- Drop man patch applied upstream +- Drop dods patch fixed upstream +- Add more tex BRs to handle changes in texlive packaging +- Fix man page install location + +* Mon Aug 19 2013 Marek Kasik - 1.9.2-12 +- Rebuild (poppler-0.24.0) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.9.2-10 +- Perl 5.18 rebuild + +* Thu Jul 11 2013 Orion Poplawski - 1.9.2-9 +- Rebuild for cfitsio 3.350 + +* Mon Jun 24 2013 Volker Fröhlich - 1.9.2-8 +- Rebuild for poppler 0.22.5 + * Wed Jun 12 2013 Orion Poplawski - 1.9.2-7 - Update Java/JNI for new guidelines, also fixes bug #908065 * Thu May 16 2013 Orion Poplawski - 1.9.2-6 - Rebuild for hdf5 1.8.11 -* Mon Apr 29 2013 Peter Robinson 1.9.2-5 +* Mon Apr 29 2013 Peter Robinson - 1.9.2-5 - Rebuild for ARM libspatialite issue * Tue Mar 26 2013 Volker Fröhlich - 1.9.2-4 - Rebuild for cfitsio 3.340 -* Sun Mar 24 2013 Peter Robinson 1.9.2-3 +* Sun Mar 24 2013 Peter Robinson - 1.9.2-3 - rebuild (libcfitsio) * Wed Mar 13 2013 Vít Ondruch - 1.9.2-2 @@ -824,7 +1881,7 @@ popd - Rebuild, see http://lists.fedoraproject.org/pipermail/devel/2012-December/175685.html -* Thu Dec 13 2012 Peter Robinson 1.9.1-14 +* Thu Dec 13 2012 Peter Robinson - 1.9.1-14 - Tweak -fpic CFLAGS to fix FTBFS on ARM * Mon Dec 3 2012 Orion Poplawski - 1.9.1-13 @@ -903,7 +1960,7 @@ popd - Harmonize the use of buildroot and RPM_BUILD_ROOT - Introduce testversion macro -* Thu Feb 19 2012 Volker Fröhlich - 1.7.3-14 +* Sun Feb 19 2012 Volker Fröhlich - 1.7.3-14 - Require Ruby abi - Add patch for Ruby 1.9 include dir, back-ported from GDAL 1.9 - Change version string for gdal-config from -fedora to @@ -955,7 +2012,7 @@ popd - Removed Python files from main package files section, that effectively already belonged to the Python sub-package -* Thu Apr 11 2011 Volker Fröhlich - 1.7.3-8 +* Mon Apr 11 2011 Volker Fröhlich - 1.7.3-8 - Solved image path problem with Latex - Removed with-tiff and updated with-sqlite to with-sqlite3 - Add more refman documents @@ -968,7 +2025,7 @@ popd * Wed Mar 23 2011 Dan Horák - 1.7.3-6 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) -* Sun Mar 20 2011 Volker Fröhlich 1.7.3-5 +* Sun Mar 20 2011 Volker Fröhlich - 1.7.3-5 - Dropped unnecessary encoding conversion for Russian refman - Install Russian refman - Don't try to install refman for sdts and dgn, as they fail to compile @@ -993,334 +2050,7 @@ popd - Added jnis - Patches updated with proper version info - Added suggestions from Ralph Apel - + Versionless symlink for gdal.jar - + Maven2 pom - + JPP-style depmap - + Use -f XX.files for ruby and python - -* Sun Oct 31 2010 Mathieu Baudier - 1.7.2-5_2 -- PCRaster support -- cURL support -- Disable building the reference manual (really too long...) - -* Sat Oct 09 2010 Mathieu Baudier - 1.7.2-5_1 -- Add Java JNI libraries - -* Sat Aug 14 2010 Mathieu Baudier - 1.7.2-5_0 -- Rebuild for EL GIS, based on work contributed by Nikolaos Hatzopoulos and Peter Hopfgartner -- Use vanilla sources - -* Wed Jul 21 2010 David Malcolm - 1.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Jul 20 2010 Orion Poplawski - 1.7.2-4 -- Rebuild with grass support - -* Thu Jul 17 2010 Orion Poplawski - 1.7.2-3 -- Add patch to change AISConnect() to Connect() for libdap 3.10 -- build without grass for libdap soname bump - -* Tue Jul 13 2010 Kevin Kofler - 1.7.2-2 -- reenable grass support - -* Fri Jul 09 2010 Robert Scheck - 1.7.2-1 -- upgrade to 1.7.2 (#587707, huge thanks to Sven Lankes) - -* Thu Mar 18 2010 Balint Cristian - 1.7.1-2 -- fix bz#572617 - -* Thu Mar 18 2010 Balint Cristian - 1.7.1-1 -- new stable branch -- re-enable java ColorTable -- gdal custom fedora version banner -- rebuild without grass -- gdal manual are gone (upstream fault) - -* Fri Feb 5 2010 Kevin Kofler - 1.6.2-5 -- reenable grass support - -* Fri Feb 5 2010 Kevin Kofler - 1.6.2-4 -- temporarily disable grass support for bootstrapping -- rebuild for new libxerces-c - -* Tue Dec 8 2009 Michael Schwendt - 1.6.2-3 -- Explicitly BR hdf-static in accordance with the Packaging - Guidelines (hdf-devel is still static-only). - -* Thu Nov 19 2009 Orion Poplawski - 1.6.2-2 -- re-enable grass support - -* Tue Nov 17 2009 Orion Poplawski - 1.6.2-1 -- Update to 1.6.2 -- Rebuild for netcdf 4.1.0 - -* Fri Aug 21 2009 Tomas Mraz - 1.6.1-2 -- rebuilt with new openssl - -* Thu Jul 30 2009 Dan Horak - 1.6.1-1 -- add patch for incompatibilities caused by libdap 3.9.x (thanks goes to arekm from PLD) -- update to 1.6.1 -- don't install some refman.pdf, because they don't build -- don't fail on man pages with suffix other than .gz -- fix filelist for python subpackage - -* Fri Jul 24 2009 Fedora Release Engineering - 1.6.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Orion Poplawski - 1.6.0-9 -- Rebuild for libdap 3.9.3, bootstrap - -* Mon Mar 23 2009 Jesse Keating - 1.6.0-8 -- re-enable grass support - -* Sun Mar 22 2009 Lubomir Rintel - 1.6.0-7 -- Depend specifically on GCJ for Java (Alex Lancaster) -- Disable grass (Alex Lancaster) -- Create %%_bindir before copying files there - -* Tue Feb 24 2009 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Balint Cristian - 1.6.0-4 -- rebuild with grass support -- fix email typo - -* Thu Jan 29 2009 Balint Cristian - 1.6.0-3 -- rebuild against mysql 5.1.30 - -* Thu Jan 29 2009 Balint Cristian - 1.6.0-2 -- email change -- rebuild without grass - -* Fri Dec 12 2008 Balint Cristian - 1.6.0-1 -- final stable release - -* Sat Dec 06 2008 Balint Cristian - 1.6.0-0.2.rc4 -- enable grass - -* Sat Dec 06 2008 Balint Cristian - 1.6.0-0.1.rc4 -- new branch -- disable grass -- fix ruby compile - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.5.3-2 -- Rebuild for Python 2.6 - -* Fri Oct 24 2008 Balint Cristian - 1.5.3-1 -- new stable -- ship static package too -- fix some doc generation -- libdap patch for fc10 only - -* Tue Sep 30 2008 Balint Cristian - 1.5.2-4 -- enable gdal_array for python subpackage -- require numpy - -* Tue Sep 9 2008 Patrice Dumas - 1.5.2-3 -- patch for libdap > 0.8.0, from Rob Cermak - -* Thu Jun 12 2008 Balint Cristian - 1.5.2-1 -- a new bugfix upstream -- drop gcc43 patch -- more license cleaned - -* Wed May 27 2008 Balint Cristian - 1.5.1-13 -- fix pkgconfig too - -* Wed May 27 2008 Balint Cristian - 1.5.1-12 -- fix once more gdal-config - -* Tue May 27 2008 Balint Cristian - 1.5.1-11 -- fix multilib gdal-config, add wrapper around -- fix typos in cpl_config.h wrapper - -* Tue May 27 2008 Balint Cristian - 1.5.1-10 -- fix for multilib packaging bz#341231 -- huge spec cleanup -- enable russian and brazil docs -- enable and triage more docs - -* Sun May 25 2008 Balint Cristian - 1.5.1-9 -- enable ruby and java packages -- fix spurious sed problem -- spec file cosmetics - -* Thu May 23 2008 Balint Cristian - 1.5.1-8 -- fix sincos on all arch - -* Thu May 15 2008 Balint Cristian - 1.5.1-7 -- fix x86_64 problem - -* Wed Apr 16 2008 Balint Cristian - 1.5.1-6 -- disable fortify source, it crash gdal for now. - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-5 -- really eanble against grass63 - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-4 -- disable grass to bootstrap once again - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-3 -- rebuild to really pick up grass63 in koji - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-2 -- enable build against newer grass -- enable build of reference manuals - -* Tue Mar 25 2008 Balint Cristian - 1.5.1-1 -- new bugfix release from upstream -- drop large parts from gcc43 patch, some are upstream now -- fix building with perl-5.10 swig binding issue - -* Wed Feb 29 2008 Orion Poplawski - 1.5.0-4 -- Rebuild for hdf5-1.8.0, use compatability API define - -* Tue Feb 12 2008 Balint Cristian - 1.5.0-3 -- install cpl_config.h manually for bz#430894 -- fix gcc4.3 build - -* Mon Jan 14 2008 Balint Cristian - 1.5.0-2 -- fix perl dependency issue. - -* Mon Jan 07 2008 Balint Cristian - 1.5.0-1 -- update to new 1.5.0 upstream stable -- dropped build patch since HFA/ILI/DGN mandatories are now present -- dropped swig patch, its upstream now -- enable HFA it holds Intergraph (TM) explicit public license -- enable DGN it holds Avenza Systems (TM) explicit public license -- enable ILI headers since now contain proper public license message -- keep and polish up rest of doubted license -- further fixed hdf not supporting netcdf for for bz#189337 -- kill the annoying -Lexternal/lib for -lgeotiff -- fix configure to not export LDFLAGS anyomre, upstream - should really switch to real GNU automagic stuff -- pymod samples and rfc docs now gone -- hardcode external libtool to be used, LIBTOOL env not propagating anymore -- use DESTDIR instead - -* Thu Jan 03 2008 Alex Lancaster - 1.4.2-7 -- Re-enable grass support now that gdal has been bootstrapped - -* Wed Jan 02 2008 Mamoru Tasaka - 1.4.2-6 -- Bootstrap 1st: disabling grass support -- Workaround for hdf not supporting netcdf (bug 189337 c8) -- Disabling documents creation for now. - -* Thu Dec 06 2007 Release Engineering - 1.4.2-5 -- Rebuild for deps -- Disable grass to avoid circular deps - -* Tue Aug 28 2007 Fedora Release Engineering - 1.4.2-3 -- Rebuild for selinux ppc32 issue. - -* Wed Jul 24 2007 Balint Cristian 1.4.2-2 -- disable one more HFA test, HFA is unaviable due to license - -* Wed Jul 24 2007 Balint Cristian 1.4.2-1 -- new upstream one -- catch some more docs -- fix ogr python module runtime -- include testcases and run tests -- enable geotiff external library we have new libgeotiff now -- EPSG geodetic database is licensed OK since v6.13 so re-enable -- enable it against grass by default, implement optional switches - -* Tue Jun 05 2007 Balint Cristian 1.4.1-4 -- re-build. - -* Sat May 12 2007 Balint Cristian 1.4.1-3 -- re-build against grass. - -* Fri May 11 2007 Balint Cristian 1.4.1-2 -- fix python lookup paths for ppc64. - -* Wed May 09 2007 Balint Cristian 1.4.1-1 -- new upstream release. -- disable temporary grass-devel requirement untill find a - resonable solution for gdal-grass egg-chicken dep problem. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-22 -- and olso dont attempt pack missing docs. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-21 -- exclude some docs, doxygen segfault with those now upstream. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-20 -- rebuild against latest fedora upstream tree. - -* Mon Apr 02 2007 Balint Cristian 1.4.0-19 -- own gdal includedir -- fix one more spurious lib path - -* Wed Mar 21 2007 Balint Cristian 1.4.0-18 -- remove system lib path from gdal-config --libs, its implicit - -* Tue Mar 20 2007 Balint Cristian 1.4.0-17 -- enable build against grass -- fix incorrect use of 32/64 library paths lookups - -* Fri Mar 16 2007 Balint Cristian 1.4.0-16 -- fix gdal flag from pkgconfig file - -* Thu Mar 15 2007 Balint Cristian 1.4.0-15 -- require pkgconfig -- generate pkgconfig from spec instead - -* Thu Mar 15 2007 Balint Cristian 1.4.0-14 -- require perl(ExtUtils::MakeMaker) instead ?dist checking -- add pkgconfig file - -* Wed Mar 14 2007 Balint Cristian 1.4.0-13 -- fix typo in specfile - -* Wed Mar 14 2007 Balint Cristian 1.4.0-12 -- add missing dot from dist string in specfile - -* Wed Mar 14 2007 Balint Cristian 1.4.0-11 -- fix fc6 fc5 builds - -* Thu Mar 1 2007 Balint Cristian 1.4.0-10 -- fix mock build -- require perl-devel - -* Tue Feb 27 2007 Balint Cristian 1.4.0-9 -- repack tarball for fedora, explain changes in PROVENANCE-fedora, - license should be clean now according to PROVENANCE-* files -- require ogdi since is available now -- drop nogeotiff patch, in -fedora tarball geotiff is removed -- man page triage over subpackages -- exclude python byte compiled objects -- fix some source C file exec bits - -* Sat Feb 24 2007 Balint Cristian 1.4.0-8 -- fix more things in spec -- include more docs - -* Wed Feb 21 2007 Balint Cristian 1.4.0-7 -- libtool in requirement list for build - -* Wed Feb 21 2007 Balint Cristian 1.4.0-6 -- use external libtool to avoid rpath usage -- include more docs - -* Mon Feb 12 2007 Balint Cristian 1.4.0-5 -- use rm -rf for removal of dirs. -- fix require lists - -* Mon Feb 12 2007 Balint Cristian 1.4.0-4 -- fix doxygen buildreq -- make sure r-path is fine. - -* Sat Feb 10 2007 Balint Cristian 1.4.0-3 -- disable now ogdi (pending ogdi submission). - -* Sat Feb 10 2007 Balint Cristian 1.4.0-2 -- more fixups for lib paths - -* Fri Feb 09 2007 Balint Cristian 1.4.0-1 -- first pack for fedora extras -- disable geotiff (untill license sorted out) -- enable all options aviable from extras -- pack perl and python modules -- kill r-path from libs -- pack all docs posible + + Versionless symlink for gdal.jar + + Maven2 pom + + JPP-style depmap + + Use -f XX.files for ruby and python diff --git a/gdal_utils.patch b/gdal_utils.patch new file mode 100644 index 0000000..e0eee7c --- /dev/null +++ b/gdal_utils.patch @@ -0,0 +1,37 @@ +diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100 ++++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-12-18 16:35:42.369730740 +0100 +@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P + gdal_standard_includes(gdal_iso8211) + + # Because linking an OBJECT library +-add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp) ++add_executable(8211dump 8211dump.cpp) + target_include_directories(8211dump PRIVATE $) + target_link_libraries(8211dump PRIVATE $ gdal_iso8211) ++install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + +-add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp) ++add_executable(8211view 8211view.cpp) + target_include_directories(8211view PRIVATE $) + target_link_libraries(8211view PRIVATE $ gdal_iso8211) ++install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + +-add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp) ++add_executable(8211createfromxml 8211createfromxml.cpp) + target_include_directories(8211createfromxml PRIVATE $) + target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) ++install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100 ++++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 16:35:42.369966573 +0100 +@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) + target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) + endif() + +-add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp) ++add_executable(s57dump s57dump.cpp) + gdal_standard_includes(s57dump) + target_include_directories(s57dump PRIVATE $) + target_link_libraries(s57dump PRIVATE $ ogr_S57 gdal_iso8211) ++install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sources b/sources index 8cbf7d4..18aa636 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1cc5e615ee5bcf32f4f2999e9021042e gdal-1.9.2-fedora.tar.gz -0d1e425b45465f64f6d1f32790d8bea0 gdalautotest-1.9.0.tar.gz +SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5 +SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5