rpms/gdal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

RHEL 9.0.0 Alpha bootstrap

Browse Source 
The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/gdal#06a5516507dcab7009972fcef17c4d6036a585d2
This commit is contained in:
Troy Dawson 2020-11-16 13:00:46 -08:00
parent 7bd76db814
commit 7b3e2665d1
10 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -53,3 +53,5 @@ gdalautotest-1.7.0.tar.gz
/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

6
gdal-1.9.0-java.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/swig/java/java.opt gdal-3.1.4-fedora-new/swig/java/java.opt
--- gdal-3.1.4-fedora/swig/java/java.opt 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/swig/java/java.opt 2020-11-02 11:56:48.341314610 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/swig/java/java.opt gdal-3.2.0-fedora-new/swig/java/java.opt
--- gdal-3.2.0-fedora/swig/java/java.opt 2020-10-26 14:05:40.000000000 +0100
+++ gdal-3.2.0-fedora-new/swig/java/java.opt 2020-11-12 00:13:52.048881098 +0100
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

6
gdal-gcc11.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-10-20 11:50:59.000000000 +0200
+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-11-02 11:56:49.997342382 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.2.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-10-26 14:09:09.000000000 +0100
+++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-11-12 00:13:53.604880951 +0100
@@ -38,6 +38,7 @@
#include <iostream>
#include <memory>

52
gdal.spec
View File

@ -1,4 +1,3 @@
#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?
@ -9,7 +8,7 @@
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
# Tests can be of a different version
%global testversion 3.1.4
%global testversion 3.2.0
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -45,7 +44,7 @@
%endif
Name: gdal
Version: 3.1.4
Version: 3.2.0
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
License: MIT
@ -84,18 +83,15 @@ BuildRequires: libtool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: ant
# No armadillo in EL5
BuildRequires: armadillo-devel
BuildRequires: bash-completion
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: geos-devel >= 3.7.1
BuildRequires: ghostscript
@ -115,12 +111,10 @@ BuildRequires: javapackages-local
%endif
BuildRequires: json-c-devel
BuildRequires: libgeotiff-devel
# No libgta in EL5
BuildRequires: libgta-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
# No libkml in EL
BuildRequires: libkml-devel
%if %{with_spatialite}
@ -128,7 +122,6 @@ BuildRequires: libspatialite-devel
%endif
BuildRequires: libtiff-devel
# No libwebp in EL 5 and 6
BuildRequires: libwebp-devel
BuildRequires: libtool
BuildRequires: giflib-devel
@ -183,7 +176,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%global cpuarch 64
%endif
#TODO: Description on the lib?
%description
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
C++ translator library for raster and vector geospatial data formats.
@ -242,6 +234,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
%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}
@ -291,6 +284,7 @@ BuildArch: noarch
%description doc
This package contains 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$
@ -301,7 +295,6 @@ This package contains documentation for GDAL.
%endif
%prep
%autosetup -p1 -n %{name}-%{version}-fedora -a 1
@ -317,21 +310,12 @@ rm -rf frmts/gtiff/libtiff
# Copy in PROVENANCE.TXT-fedora
cp -p %SOURCE4 .
# Sanitize permissions
chmod 644 apps/gnmanalyse.cpp apps/gnmmanage.cpp
# 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
%endif
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure.ac
# Delete .doxygen_up_to_date, otherwise doxygen isn't run
rm -f doc/.doxygen_up_to_date
%build
# For future reference:
@ -573,6 +557,7 @@ popd
%files
%{_bindir}/gdallocationinfo
%{_bindir}/gdal_contour
%{_bindir}/gdal_create
%{_bindir}/gdal_rasterize
%{_bindir}/gdal_translate
%{_bindir}/gdaladdo
@ -584,7 +569,6 @@ popd
%{_bindir}/gdal_grid
%{_bindir}/gdalenhance
%{_bindir}/gdalmanage
%{_bindir}/gdalserver
%{_bindir}/gdalsrsinfo
%{_bindir}/gdaltransform
%{_bindir}/nearblack
@ -611,11 +595,11 @@ popd
%files libs
%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
%{_libdir}/libgdal.so.27
%{_libdir}/libgdal.so.27.*
%license LICENSE.TXT
%doc NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
%{_libdir}/libgdal.so.28
%{_libdir}/libgdal.so.28.*
%{_datadir}/%{name}
#TODO: Possibly remove files like .dxf, .dgn, ...
%dir %{_libdir}/%{name}plugins
%files devel
@ -646,11 +630,8 @@ popd
%files -n python2-gdal
%doc swig/python/README.rst
%doc swig/python/samples
%{python2_sitearch}/osgeo
%{python2_sitearch}/GDAL-%{version}-py*.egg-info
%{python2_sitearch}/osr.py*
%{python2_sitearch}/ogr.py*
%{python2_sitearch}/gdal*.py*
%{python2_sitearch}/osgeo/
%{python2_sitearch}/GDAL-%{version}-py*.egg-info/
%endif
%if %{with python3}
@ -658,13 +639,7 @@ popd
%doc swig/python/README.rst
%doc swig/python/samples
%{python3_sitearch}/osgeo
%{python3_sitearch}/GDAL-%{version}-py*.egg-info
%{python3_sitearch}/osr.py
%{python3_sitearch}/__pycache__/osr.*.py*
%{python3_sitearch}/ogr.py
%{python3_sitearch}/__pycache__/ogr.*.py*
%{python3_sitearch}/gdal*.py
%{python3_sitearch}/__pycache__/gdal*.*.py*
%{python3_sitearch}/GDAL-%{version}-py*.egg-info/
%endif
%if %{with python2} || %{with python3}
@ -691,6 +666,9 @@ popd
#Or as before, using ldconfig
%changelog
* Thu Nov 05 2020 Sandro Mani <manisandro@gmail.com> - 3.2.0-1
- Update to 3.2.0
* Mon Nov 02 2020 Sandro Mani <manisandro@gmail.com> - 3.1.4-1
- Update to 3.1.4

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/apps/GNUmakefile gdal-3.1.4-fedora-new/apps/GNUmakefile
--- gdal-3.1.4-fedora/apps/GNUmakefile 2020-10-20 11:47:09.000000000 +0200
+++ gdal-3.1.4-fedora-new/apps/GNUmakefile 2020-11-02 11:56:49.446333140 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/apps/GNUmakefile gdal-3.2.0-fedora-new/apps/GNUmakefile
--- gdal-3.2.0-fedora/apps/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/apps/GNUmakefile 2020-11-12 00:13:53.083881000 +0100
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default

6
gdal_iso8211.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile 2020-11-02 11:56:48.896323916 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/iso8211/GNUmakefile gdal-3.2.0-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.2.0-fedora/frmts/iso8211/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/frmts/iso8211/GNUmakefile 2020-11-12 00:13:52.575881048 +0100
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

8
gdal_nopdf.patch
View File

@ -1,7 +1,7 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/doc/source/index.rst gdal-3.1.4-fedora-new/doc/source/index.rst
--- gdal-3.1.4-fedora/doc/source/index.rst 2020-10-20 11:47:09.000000000 +0200
+++ gdal-3.1.4-fedora-new/doc/source/index.rst 2020-11-02 11:56:49.720337736 +0100
@@ -9,8 +9,6 @@ GDAL
diff -rupN --no-dereference gdal-3.2.0-fedora/doc/source/index.rst gdal-3.2.0-fedora-new/doc/source/index.rst
--- gdal-3.2.0-fedora/doc/source/index.rst 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/doc/source/index.rst 2020-11-12 00:13:53.348880975 +0100
@@ -4,8 +4,6 @@ GDAL
.. include:: ./about_no_title.rst

6
gdal_sphinx.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/doc/Makefile gdal-3.1.4-fedora-new/doc/Makefile
--- gdal-3.1.4-fedora/doc/Makefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/doc/Makefile 2020-11-02 11:56:49.173328561 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/doc/Makefile gdal-3.2.0-fedora-new/doc/Makefile
--- gdal-3.2.0-fedora/doc/Makefile 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/doc/Makefile 2020-11-12 00:13:52.828881024 +0100
@@ -2,7 +2,7 @@
#

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.4-fedora/frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.2.0-fedora/frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/dods/GNUmakefile gdal-3.1.4-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100
diff -rupN --no-dereference gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
+++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.1.4-fedora.tar.xz) = 191e52c9d01a349a2036fb82f10aad8f2945b1bc0c10e04d568d10644e0b64e503efc38c38f73ab9a80d0ece39ae625b64531eededb91af7b7ea95ad3dcc4105
SHA512 (gdalautotest-3.1.4.tar.gz) = 656215632d37fd9dba377ef28d44dce47bcda6cd3ce8eeddf48c22d810f906e805664b2980d04f07ae4653fc3b385a7ee321e0fe7d69f9c2d83d2b271367161c
SHA512 (gdalautotest-3.2.0.tar.gz) = 8ac8283c10ff397fc7cadceb02871c5c9e25d86d63c1eac8bb0e6e3c45f742c70143b759d20c7fb2e350b09528dad4d9449e863456d6283170637c1fdb7cc65a
SHA512 (gdal-3.2.0-fedora.tar.xz) = 0fa73c1d188646b08b139c85f7b339e638d593e3d58fda8a93183f66dcbf62feba10423cd4a1669bef59aa2bcf423686dec63e2a9e95e173666793eb3492dcd0