Compare commits
No commits in common. "f35" and "master" have entirely different histories.
|
|
@ -43,27 +43,3 @@ gdalautotest-1.7.0.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
|
||||
/gdalautotest-3.3.3.tar.gz
|
||||
/gdal-3.3.3-fedora.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
diff -rupN gdal-3.3.2-fedora/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp gdal-3.3.2-fedora-new/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp
|
||||
--- gdal-3.3.2-fedora/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp 2021-09-01 11:51:01.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp 2022-02-04 18:57:11.761058218 +0100
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "pcidsk_exception.h"
|
||||
#include "core/pcidsk_utils.h"
|
||||
|
||||
+#include <limits>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <cassert>
|
||||
@@ -73,8 +74,12 @@ void CPCIDSKBinarySegment::Load()
|
||||
if (loaded_) {
|
||||
return;
|
||||
}
|
||||
+ if( data_size - 1024 > static_cast<uint64_t>(std::numeric_limits<int>::max()) )
|
||||
+ {
|
||||
+ return ThrowPCIDSKException("too large data_size");
|
||||
+ }
|
||||
|
||||
- seg_data.SetSize((int)data_size - 1024);
|
||||
+ seg_data.SetSize((int)(data_size - 1024));
|
||||
|
||||
ReadFromFile(seg_data.buffer, 0, data_size - 1024);
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.0.4-fedora/swig/java/java.opt 2020-01-28 11:13:12.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/swig/java/java.opt 2020-02-06 00:23:36.321286290 +0100
|
||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
||||
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
|
||||
|
||||
|
||||
|
|
@ -1,15 +1,7 @@
|
|||
#!/bin/bash
|
||||
VERSION="3.0.4"
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: $0 version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION="$1"
|
||||
|
||||
wget https://github.com/OSGeo/gdal/releases/download/v$VERSION/gdal-$VERSION.tar.gz
|
||||
|
||||
tar xvf gdal-"${VERSION}".tar.gz
|
||||
tar xvf gdal-"${VERSION}".tar.xz
|
||||
|
||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
|
||||
--- gdal-3.0.4-fedora/scripts/GNUmakefile 2020-01-28 11:13:13.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile 2020-02-06 00:23:36.089287463 +0100
|
||||
@@ -5,6 +5,6 @@ completion:
|
||||
|
||||
install:
|
||||
if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
|
||||
- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
|
||||
- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
|
||||
+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
|
||||
+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
|
||||
fi
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
|
||||
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-09-01 11:49:35.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-09-07 12:51:18.767929853 +0200
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <limits>
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// CADVector
|
||||
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-09-01 11:49:34.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-09-07 12:51:18.768929851 +0200
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <limits>
|
||||
|
||||
#if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
|
||||
// gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
|
||||
diff -rupN --no-dereference gdal-3.3.2-fedora/third_party/LercLib/Lerc2.h gdal-3.3.2-fedora-new/third_party/LercLib/Lerc2.h
|
||||
--- gdal-3.3.2-fedora/third_party/LercLib/Lerc2.h 2021-09-01 11:48:49.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/third_party/LercLib/Lerc2.h 2021-09-07 12:51:18.768929851 +0200
|
||||
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
|
||||
#include <limits>
|
||||
#include <string>
|
||||
#include <typeinfo>
|
||||
+#include <limits>
|
||||
#include "Defines.h"
|
||||
#include "BitMask.h"
|
||||
#include "BitStuffer2.h"
|
||||
386
gdal.spec
386
gdal.spec
|
|
@ -1,3 +1,4 @@
|
|||
#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?
|
||||
|
|
@ -8,8 +9,8 @@
|
|||
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
|
||||
|
||||
# Tests can be of a different version
|
||||
%global testversion 3.3.3
|
||||
%global run_tests 1
|
||||
%global testversion 3.0.4
|
||||
%global run_tests 0
|
||||
|
||||
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
|
||||
|
||||
|
|
@ -31,6 +32,7 @@
|
|||
%global spatialite "--with-spatialite"
|
||||
%endif
|
||||
|
||||
%bcond_with python2
|
||||
%bcond_without python3
|
||||
|
||||
# No ppc64 build for spatialite in EL6
|
||||
|
|
@ -43,8 +45,8 @@
|
|||
%endif
|
||||
|
||||
Name: gdal
|
||||
Version: 3.3.3
|
||||
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
||||
Version: 3.0.4
|
||||
Release: 4%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
||||
Summary: GIS file format library
|
||||
License: MIT
|
||||
URL: http://www.gdal.org
|
||||
|
|
@ -59,29 +61,16 @@ Source3: %{name}-cleaner.sh
|
|||
|
||||
Source4: PROVENANCE.TXT-fedora
|
||||
|
||||
# Java build fixes
|
||||
Patch2: gdal_java.patch
|
||||
# Fix bash-completion install dir
|
||||
Patch1: %{name}-completion.patch
|
||||
# Fedora uses Alternatives for Java
|
||||
Patch2: %{name}-1.9.0-java.patch
|
||||
# Ensure rpc/types.h is found by dods driver (indirectly required by libdap/XDRUtils.h)
|
||||
Patch3: gdal_tirpcinc.patch
|
||||
# Use libtool to create libiso8211.a, otherwise broken static lib is created since object files are compiled through libtool
|
||||
Patch4: gdal_iso8211.patch
|
||||
# Don't pass -W to sphinx, it causes it to error out on warnings
|
||||
# Don't do parallel build, currently fails with "Sphinx parallel build error: NotImplementedError"
|
||||
Patch5: gdal_sphinx.patch
|
||||
# Fix makefiles installing libtool wrappers instead of actual executables
|
||||
Patch6: gdal_installapps.patch
|
||||
# Don't refer to PDF manual which is not built
|
||||
Patch7: gdal_nopdf.patch
|
||||
# Fix issues caught by gcc-11
|
||||
Patch8: %{name}-gcc11.patch
|
||||
# Drop -diag-disable compile flag
|
||||
Patch9: gdal_no-diag-disable.patch
|
||||
# Fix build with autoconf 2.70
|
||||
Patch10: gdal_autoconf270.patch
|
||||
# Backport patch for CVE-2021-45943
|
||||
# https://github.com/OSGeo/gdal/pull/4944
|
||||
Patch11: CVE-2021-45943.patch
|
||||
|
||||
Patch5: gdal_installapps.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -89,38 +78,38 @@ 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: g2clib-static
|
||||
BuildRequires: geos-devel >= 3.7.1
|
||||
BuildRequires: ghostscript
|
||||
BuildRequires: hdf-devel
|
||||
BuildRequires: hdf-static
|
||||
BuildRequires: hdf5-devel
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
%endif
|
||||
BuildRequires: jasper-devel
|
||||
BuildRequires: jpackage-utils
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
# For 'mvn_artifact' and 'mvn_install'
|
||||
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,6 +117,7 @@ BuildRequires: libspatialite-devel
|
|||
%endif
|
||||
|
||||
BuildRequires: libtiff-devel
|
||||
# No libwebp in EL 5 and 6
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: giflib-devel
|
||||
|
|
@ -149,12 +139,13 @@ BuildRequires: poppler-devel
|
|||
%endif
|
||||
BuildRequires: libpq-devel
|
||||
BuildRequires: proj-devel >= 5.2.0
|
||||
%if %{with python2}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-numpy
|
||||
%endif
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-numpy
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3dist(pytest) >= 3.6
|
||||
BuildRequires: python3dist(lxml) >= 4.5.1
|
||||
%endif
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: swig
|
||||
|
|
@ -164,10 +155,11 @@ BuildRequires: xz-devel
|
|||
BuildRequires: zlib-devel
|
||||
BuildRequires: libtirpc-devel
|
||||
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-sphinx_rtd_theme
|
||||
BuildRequires: python3-breathe
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/epstopdf
|
||||
BuildRequires: /usr/bin/latex
|
||||
BuildRequires: /usr/bin/dvips
|
||||
BuildRequires: tex(newunicodechar.sty)
|
||||
|
||||
|
||||
# Run time dependency for gpsbabel driver
|
||||
Requires: gpsbabel
|
||||
|
|
@ -181,6 +173,7 @@ 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.
|
||||
|
|
@ -210,8 +203,6 @@ Provides: bundled(degrib) = 2.14
|
|||
This package contains the GDAL file format library.
|
||||
|
||||
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
%package java
|
||||
Summary: Java modules for the GDAL file format library
|
||||
Requires: jpackage-utils
|
||||
|
|
@ -228,7 +219,6 @@ BuildArch: noarch
|
|||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
%endif
|
||||
|
||||
|
||||
%package perl
|
||||
|
|
@ -239,6 +229,22 @@ 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}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Summary: Python modules for the GDAL file format library
|
||||
Requires: numpy
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python2-gdal
|
||||
The GDAL Python modules provide support to handle multiple GIS file formats.
|
||||
The package also includes a couple of useful utilities in Python.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-gdal
|
||||
|
|
@ -254,10 +260,10 @@ The GDAL Python 3 modules provide support to handle multiple GIS file formats.
|
|||
%endif
|
||||
|
||||
|
||||
%if %{with python3}
|
||||
%if %{with python2} || %{with python3}
|
||||
%package python-tools
|
||||
Summary: Python tools for the GDAL file format library
|
||||
Requires: python3-gdal
|
||||
Requires: %{?with_python3:python3-gdal}%{?!with_python3:python2-gdal}
|
||||
|
||||
%description python-tools
|
||||
The GDAL Python package provides number of tools for programming and
|
||||
|
|
@ -272,13 +278,17 @@ BuildArch: noarch
|
|||
%description doc
|
||||
This package contains documentation for GDAL.
|
||||
|
||||
|
||||
# We don't want to provide private Python extension libs
|
||||
%if %{with_python3}
|
||||
%if %{with python2} && %{with python3}
|
||||
%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\.so$
|
||||
%elif %{with python2}
|
||||
%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$
|
||||
%elif %{with_python3}
|
||||
%global __provides_exclude_from ^%{python3_sitearch}/.*\.so$
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}-fedora -a 1
|
||||
|
||||
|
|
@ -294,12 +304,18 @@ 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
|
||||
|
||||
|
||||
%build
|
||||
# For future reference:
|
||||
|
|
@ -309,9 +325,9 @@ autoreconf -ifv
|
|||
|
||||
%configure \
|
||||
--with-autoload=%{_libdir}/%{name}plugins \
|
||||
--datadir=%{_datadir}/%{name}/ \
|
||||
--includedir=%{_includedir}/%{name}/ \
|
||||
--prefix=%{_prefix} \
|
||||
--with-bash-completion \
|
||||
--with-armadillo \
|
||||
--with-curl \
|
||||
--with-cfitsio \
|
||||
|
|
@ -325,9 +341,7 @@ autoreconf -ifv
|
|||
--with-hdf4 \
|
||||
--with-hdf5 \
|
||||
--with-jasper \
|
||||
%if 0%{?rhel} < 8
|
||||
--with-java \
|
||||
%endif
|
||||
--with-jpeg \
|
||||
--with-libjson-c \
|
||||
--without-jpeg12 \
|
||||
|
|
@ -355,28 +369,23 @@ autoreconf -ifv
|
|||
--with-libkml
|
||||
|
||||
%make_build
|
||||
make man
|
||||
make docs
|
||||
|
||||
# Build some utilities, as requested in BZ #1271906
|
||||
make -C ogr/ogrsf_frmts/s57 all
|
||||
make -C frmts/iso8211 all
|
||||
|
||||
# Documentation
|
||||
make man
|
||||
make docs
|
||||
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
|
||||
# Make Java module and documentation
|
||||
pushd swig/java
|
||||
make
|
||||
ANT_OPTS="-Dfile.encoding=utf-8" ant maven
|
||||
ant maven
|
||||
popd
|
||||
%mvn_artifact swig/java/build/maven/gdal-%version.pom swig/java/build/maven/gdal-%version.jar
|
||||
%endif
|
||||
|
||||
# Make Python modules
|
||||
pushd swig/python
|
||||
%{?with_python2:%py2_build}
|
||||
%{?with_python3:%py3_build}
|
||||
popd
|
||||
|
||||
|
|
@ -386,9 +395,29 @@ pushd swig/perl
|
|||
%make_build
|
||||
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
|
||||
pushd $docdir
|
||||
if [ ! -f Doxyfile ]; then
|
||||
doxygen -g
|
||||
else
|
||||
doxygen -u
|
||||
fi
|
||||
if [ $docdir == "doc/ru" ]; then
|
||||
sed -i -e 's|^OUTPUT_LANGUAGE|OUTPUT_LANGUAGE = Russian\n#OUTPUT_LANGUAGE |' Doxyfile
|
||||
fi
|
||||
rm -rf html
|
||||
doxygen
|
||||
popd
|
||||
done
|
||||
|
||||
|
||||
%install
|
||||
pushd swig/python
|
||||
%{?with_python2:%py2_install}
|
||||
%{?with_python3:%py3_install}
|
||||
popd
|
||||
|
||||
|
|
@ -396,26 +425,19 @@ popd
|
|||
|
||||
%make_install install-man
|
||||
|
||||
# Drop gdal.pdf symlink, as we don't build the pdf documentation
|
||||
rm doc/build/html/gdal.pdf
|
||||
|
||||
# Drop samples, installed through %%doc
|
||||
rm -rf %{python3_sitearch}/osgeo_utils/samples
|
||||
|
||||
install -pm 755 ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir}
|
||||
install -pm 755 frmts/iso8211/8211createfromxml %{buildroot}%{_bindir}
|
||||
install -pm 755 frmts/iso8211/8211dump %{buildroot}%{_bindir}
|
||||
install -pm 755 frmts/iso8211/8211view %{buildroot}%{_bindir}
|
||||
# Rename for %%files doc below
|
||||
mv frmts/iso8211/html frmts/iso8211/iso8211_html
|
||||
|
||||
# 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 '{}' \;
|
||||
rm %{buildroot}%{perl_archlib}/perllocal.pod
|
||||
|
||||
%if %{without python3}
|
||||
%if %{without python} && %{without python3}
|
||||
rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
|
||||
%endif
|
||||
|
||||
|
|
@ -424,8 +446,6 @@ rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
|
|||
find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
|
||||
find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \;
|
||||
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
# install Java plugin
|
||||
%mvn_install -J swig/java/java
|
||||
|
||||
|
|
@ -440,7 +460,21 @@ 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}
|
||||
%endif
|
||||
|
||||
# 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
|
||||
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
|
||||
|
|
@ -494,57 +528,53 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-config
|
|||
#jni-libs and libgdal are also built static (*.a)
|
||||
#.exists and .packlist stem from Perl
|
||||
for junk in {*.a,*.la,*.bs,.exists,.packlist} ; do
|
||||
find %{buildroot} -name "$junk" -delete
|
||||
find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
|
||||
done
|
||||
|
||||
# Don't duplicate license files
|
||||
rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
|
||||
|
||||
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
%check
|
||||
%if %{run_tests}
|
||||
for i in -I/usr/lib/jvm/java/include{,/linux}; do
|
||||
java_inc="$java_inc $i"
|
||||
done
|
||||
%endif
|
||||
|
||||
|
||||
pushd %{name}autotest-%{testversion}
|
||||
# Export test enviroment
|
||||
export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
|
||||
#TODO: Nötig?
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
|
||||
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc
|
||||
|
||||
export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
|
||||
|
||||
# Enable these tests on demand
|
||||
#export GDAL_RUN_SLOW_TESTS=1
|
||||
#export GDAL_DOWNLOAD_TEST_DATA=1
|
||||
|
||||
# Some tests are currently skipped:
|
||||
# - `test_fits_vector` because it's crashing.
|
||||
# - `test_http*`, `test_jp2openjpeg_45`, `*multithreaded_download*`,
|
||||
# `*multithreaded_upload*`, and `test_vsis3_no_sign_request`, which
|
||||
# try to connect externally.
|
||||
# - `test_eedai_GOOGLE_APPLICATION_CREDENTIALS` which seems to use the
|
||||
# internet.
|
||||
# - `test_osr_erm_1`, `test_ers_4`, `test_ers_8`, and `test_ers_10` as
|
||||
# they use `ecw_cs.wkt` which was removed due to unclear license.
|
||||
# - `test_jpeg2000_8` and `test_jpeg2000_11` as files don't load,
|
||||
# perhaps due to buggy Jasper library?
|
||||
# - `test_osr_ct_options_area_of_interest` returns the wrong value, but
|
||||
# it's skipped on macOS by upstream for mysteriously failing as well,
|
||||
# so do the same here.
|
||||
# - `test_ndf_1` because it hangs on i686 and armv7hl
|
||||
# FIXME: Tests hang on i686 and armv7hl
|
||||
%ifnarch i686 armv7hl
|
||||
%{pytest} -k 'not test_fits_vector and not test_http and not test_jp2openjpeg_45 and not multithreaded_download and not multithreaded_upload and not test_vsis3_no_sign_request and not test_eedai_GOOGLE_APPLICATION_CREDENTIALS and not test_osr_erm_1 and not test_ers_4 and not test_ers_8 and not test_ers_10 and not test_jpeg2000_8 and not test_jpeg2000_11 and not test_osr_ct_options_area_of_interest and not test_ndf_1' || :
|
||||
%endif
|
||||
# Remove some test cases that would require special preparation
|
||||
rm -rf ogr/ogr_pg.py # No database available
|
||||
rm -rf ogr/ogr_mysql.py # No database available
|
||||
rm -rf osr/osr_esri.py # ESRI datum absent
|
||||
rm -rf osr/osr_erm.py # File from ECW absent
|
||||
|
||||
# Run tests but force normal exit in the end
|
||||
./run_all.py || true
|
||||
popd
|
||||
%endif
|
||||
#%%{run_tests}
|
||||
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
|
||||
%files
|
||||
%{bashcompletiondir}/*
|
||||
%{_bindir}/gdallocationinfo
|
||||
%{_bindir}/gdal_contour
|
||||
%{_bindir}/gdal_create
|
||||
%{_bindir}/gdal_rasterize
|
||||
%{_bindir}/gdal_translate
|
||||
%{_bindir}/gdaladdo
|
||||
|
|
@ -556,19 +586,16 @@ popd
|
|||
%{_bindir}/gdal_grid
|
||||
%{_bindir}/gdalenhance
|
||||
%{_bindir}/gdalmanage
|
||||
%{_bindir}/gdalserver
|
||||
%{_bindir}/gdalsrsinfo
|
||||
%{_bindir}/gdaltransform
|
||||
%{_bindir}/nearblack
|
||||
%{_bindir}/gdal_viewshed
|
||||
%{_bindir}/gdalmdiminfo
|
||||
%{_bindir}/gdalmdimtranslate
|
||||
%{_bindir}/ogr*
|
||||
%{_bindir}/8211*
|
||||
%{_bindir}/s57*
|
||||
%{_bindir}/testepsg
|
||||
%{_bindir}/gnmanalyse
|
||||
%{_bindir}/gnmmanage
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
%{_mandir}/man1/gdal*.1*
|
||||
%exclude %{_mandir}/man1/gdal-config.1*
|
||||
%exclude %{_mandir}/man1/gdal2tiles.1*
|
||||
|
|
@ -582,11 +609,11 @@ popd
|
|||
|
||||
|
||||
%files libs
|
||||
%license LICENSE.TXT
|
||||
%doc NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
|
||||
%{_libdir}/libgdal.so.29
|
||||
%{_libdir}/libgdal.so.29.*
|
||||
%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
|
||||
%{_libdir}/libgdal.so.26
|
||||
%{_libdir}/libgdal.so.26.*
|
||||
%{_datadir}/%{name}
|
||||
#TODO: Possibly remove files like .dxf, .dgn, ...
|
||||
%dir %{_libdir}/%{name}plugins
|
||||
|
||||
%files devel
|
||||
|
|
@ -598,29 +625,44 @@ popd
|
|||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
# No complete java yet in EL8
|
||||
%if 0%{?rhel} < 8
|
||||
# Can I even have a separate Java package anymore?
|
||||
%files java -f .mfiles
|
||||
%doc swig/java/apps
|
||||
%{_jnidir}/%{name}/libgdalalljni.so*
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%endif
|
||||
|
||||
%files perl
|
||||
%doc swig/perl/README
|
||||
%{perl_vendorarch}/*
|
||||
%{_mandir}/man3/*.3pm*
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-gdal
|
||||
%doc swig/python/README.rst
|
||||
%doc swig/python/samples
|
||||
%{python2_sitearch}/osgeo
|
||||
%{python2_sitearch}/GDAL-%{version}-py*.egg-info
|
||||
%{python2_sitearch}/osr.py*
|
||||
%{python2_sitearch}/ogr.py*
|
||||
%{python2_sitearch}/gdal*.py*
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-gdal
|
||||
%doc swig/python/README.rst
|
||||
%doc swig/python/gdal-utils/osgeo_utils/samples
|
||||
%{python3_sitearch}/GDAL-%{version}-py*.egg-info/
|
||||
%{python3_sitearch}/osgeo/
|
||||
%{python3_sitearch}/osgeo_utils/
|
||||
%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*
|
||||
%endif
|
||||
|
||||
%if %{with python2} || %{with python3}
|
||||
%files python-tools
|
||||
%_bindir/*.py
|
||||
%{_mandir}/man1/pct2rgb.1*
|
||||
|
|
@ -633,7 +675,7 @@ popd
|
|||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html frmts/iso8211/iso8211_html
|
||||
%doc gdal_frmts ogrsf_frmts refman
|
||||
|
||||
#TODO: jvm
|
||||
#Should be managed by the Alternatives system and not via ldconfig
|
||||
|
|
@ -644,138 +686,6 @@ popd
|
|||
#Or as before, using ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Feb 04 2022 Sandro Mani <manisandro@gmail.com> - 3.3.3-1
|
||||
- Update to 3.3.3
|
||||
|
||||
* Fri Feb 04 2022 Sandro Mani <manisandro@gmail.com> - 3.3.2-2
|
||||
- Backport patch for CVE-2021-45943
|
||||
|
||||
* Tue Sep 07 2021 Sandro Mani <manisandro@gmail.com> - 3.3.2-1
|
||||
- Update to 3.3.2
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 3.3.1-5
|
||||
- Rebuild for hdf5 1.10.7/netcdf 4.8.0
|
||||
|
||||
* Mon Aug 02 2021 Sandro Mani <manisandro@gmail.com> - 3.3.1-4
|
||||
- Rebuild (poppler)
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 3.3.1-2
|
||||
- Rebuild for versioned symbols in json-c
|
||||
|
||||
* Mon Jul 05 2021 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
|
||||
- Update to 3.3.1
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.3.0-7
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.0-6
|
||||
- Perl 5.34 re-rebuild updated packages
|
||||
|
||||
* Fri May 21 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-5
|
||||
- Rebuild (libgta)
|
||||
|
||||
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.0-4
|
||||
- Perl 5.34 rebuild
|
||||
|
||||
* Thu May 20 2021 Richard Shaw <hobbes1069@gmail.com> - 3.3.0-3
|
||||
- Rebuilding for libgta 1.2.1.
|
||||
|
||||
* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-2
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Mon May 03 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-1
|
||||
- Update to 3.3.0
|
||||
|
||||
* Wed Mar 24 2021 Sandro Mani <manisandro@gmail.com> - 3.2.2-1
|
||||
- Update to 3.2.2
|
||||
|
||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-10
|
||||
- Rebuild (proj)
|
||||
|
||||
* Tue Feb 23 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.1-9
|
||||
- Fix compile against GEOS on s390x
|
||||
|
||||
* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-8
|
||||
- Rebuild (geos)
|
||||
|
||||
* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-7
|
||||
- Rebuild (geos)
|
||||
|
||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.2.1-6
|
||||
- rebuild for libpq ABI fix rhbz#1908268
|
||||
|
||||
* Mon Feb 01 2021 Orion Poplawski <orion@nwra.com> - 3.2.1-5
|
||||
- Rebuild for cfitsio 3.490
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 11:51:40 CET 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-3
|
||||
- Rebuild (poppler)
|
||||
|
||||
* Tue Jan 5 18:08:07 WET 2021 José Matos <jamatos@fedoraproject.org> - 3.2.1-2
|
||||
- rebuild for armadillo 10
|
||||
|
||||
* Mon Jan 04 2021 Sandro Mani <manisandro@gmail.coM> - 3.2.1-1
|
||||
- Update to 3.2.1
|
||||
|
||||
* 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
|
||||
|
||||
* Wed Oct 28 2020 Jeff Law <law@redhat.com> - 3.1.3-3
|
||||
- Fix missing #include for gcc-11
|
||||
|
||||
* Fri Oct 16 21:25:24 CEST 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-2
|
||||
- Rebuild (jasper)
|
||||
|
||||
* Mon Sep 07 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-1
|
||||
- Update to 3.1.3
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 09:48:50 GMT 2020 Sandro Mani <manisandro@gmail.com> - 3.1.2-5
|
||||
- Rebuild (poppler)
|
||||
|
||||
* Thu Jul 16 2020 Jiri Vanek <jvanek@redhat.com> - 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 <manisandro@gmail.com> - 3.1.2-3
|
||||
- Rebuild (poppler)
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.2-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Tue Jul 07 2020 Sandro Mani <manisandro@gmail.com> - 3.1.2-1
|
||||
- Update to 3.1.2
|
||||
|
||||
* Tue Jun 30 2020 Sandro Mani <manisandro@gmail.com> - 3.1.1-1
|
||||
- Update to 3.1.1
|
||||
|
||||
* Sat Jun 27 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.1.0-5
|
||||
- Perl 5.32 re-rebuild updated packages
|
||||
|
||||
* Fri Jun 26 2020 Orion Poplawski <orion@nwra.com> - 3.1.0-4
|
||||
- Rebuild for hdf5 1.10.6
|
||||
|
||||
* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.1.0-3
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-2
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Tue May 12 2020 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
|
||||
- Update to 3.1.0
|
||||
|
||||
* Sat May 09 2020 Markus Neteler <neteler@mundialis.de> - 3.0.4-5
|
||||
* disabled JAVA and LaTeX support for EPEL8, due to (yet) missing dependencies
|
||||
|
||||
* Wed Apr 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.4-4
|
||||
- Re-enable annobin
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/m4/lib-link.m4 gdal-3.3.2-fedora-new/m4/lib-link.m4
|
||||
--- gdal-3.3.2-fedora/m4/lib-link.m4 2021-09-01 11:49:49.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/m4/lib-link.m4 2021-09-07 12:51:19.228928933 +0200
|
||||
@@ -108,8 +108,6 @@ dnl acl_hardcode_direct,
|
||||
dnl acl_hardcode_minus_L.
|
||||
AC_DEFUN([AC_LIB_RPATH],
|
||||
[
|
||||
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
||||
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
||||
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
||||
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/apps/GNUmakefile gdal-3.3.2-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.3.2-fedora/apps/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/apps/GNUmakefile 2021-09-07 12:51:18.318930754 +0200
|
||||
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
|
||||
diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.0.4-fedora/apps/GNUmakefile 2020-01-28 11:13:12.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/apps/GNUmakefile 2020-03-03 23:17:41.032487778 +0100
|
||||
@@ -216,6 +216,7 @@ gdal-config-inst: gdal-config.in ../GDAL
|
||||
|
||||
install: default
|
||||
for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/frmts/iso8211/GNUmakefile gdal-3.3.2-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.3.2-fedora/frmts/iso8211/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/frmts/iso8211/GNUmakefile 2021-09-07 12:51:17.869931658 +0200
|
||||
diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile 2020-02-06 00:24:10.382117696 +0100
|
||||
@@ -23,8 +23,7 @@ dist-clean: clean
|
||||
rm -rf $(DISTDIR)
|
||||
|
||||
|
|
|
|||
112
gdal_java.patch
112
gdal_java.patch
|
|
@ -1,112 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/add_javadoc.c gdal-3.3.2-fedora-new/swig/java/add_javadoc.c
|
||||
--- gdal-3.3.2-fedora/swig/java/add_javadoc.c 2021-09-01 11:48:29.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/swig/java/add_javadoc.c 2021-09-07 12:51:17.389932633 +0200
|
||||
@@ -133,22 +133,22 @@ int main(int argc, char* argv[])
|
||||
FILE* fDst;
|
||||
JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000);
|
||||
int nInstances = 0;
|
||||
- char szLine[256];
|
||||
- char szClass[256];
|
||||
+ char szLine[512];
|
||||
+ char szClass[512];
|
||||
char javadoc[16384];
|
||||
szClass[0] = 0;
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
if (strstr(szLine, "/**") == NULL) continue;
|
||||
begin:
|
||||
strcpy(javadoc, szLine);
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
strcat(javadoc, szLine);
|
||||
if (strstr(szLine, "*/"))
|
||||
break;
|
||||
}
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
if (szLine[0] == 10)
|
||||
continue;
|
||||
@@ -188,10 +188,10 @@ begin:
|
||||
fDst = fopen(szDstName, "wt");
|
||||
if (fDst == NULL) continue;
|
||||
szClass[0] = 0;
|
||||
- char szPackage[256];
|
||||
+ char szPackage[512];
|
||||
szPackage[0] = 0;
|
||||
|
||||
- while(fgets(szLine, 255, fSrc))
|
||||
+ while(fgets(szLine, 511, fSrc))
|
||||
{
|
||||
char szMethodName[1024];
|
||||
char* szOriLine = strdup(szLine);
|
||||
@@ -224,8 +224,10 @@ begin:
|
||||
if (strstr(szLine, "synchronized "))
|
||||
{
|
||||
char* c = strstr(szLine, "synchronized ");
|
||||
+ char rest[512];
|
||||
+ strcpy(rest, c + 13);
|
||||
*c = 0;
|
||||
- strcat(szLine, c + 13);
|
||||
+ strcat(szLine, rest);
|
||||
}
|
||||
if (strstr(szLine, "public") && !strstr(szLine, "native"))
|
||||
{
|
||||
@@ -234,7 +236,7 @@ begin:
|
||||
strcpy(szMethodName, szLine);
|
||||
do
|
||||
{
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
strcpy(szMethodName + strlen(szMethodName) - 1, szLine);
|
||||
} while (!strchr(szMethodName,')'));
|
||||
strcpy(szLine, szMethodName);
|
||||
@@ -261,7 +263,7 @@ begin:
|
||||
{
|
||||
do
|
||||
{
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
} while (!strchr(szLine,'}'));
|
||||
}
|
||||
break;
|
||||
@@ -289,7 +291,7 @@ begin:
|
||||
nBrackets --;
|
||||
}
|
||||
}
|
||||
- fgets(szLine, 255, fSrc);
|
||||
+ fgets(szLine, 511, fSrc);
|
||||
} while(bFoundOpen == FALSE || nBrackets > 0);
|
||||
}
|
||||
else
|
||||
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/javadoc.java gdal-3.3.2-fedora-new/swig/java/javadoc.java
|
||||
--- gdal-3.3.2-fedora/swig/java/javadoc.java 2021-09-01 11:48:29.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/swig/java/javadoc.java 2021-09-07 12:51:17.391932629 +0200
|
||||
@@ -11982,12 +11982,12 @@ public interface osrConstants:public fin
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM
|
||||
|
||||
/**
|
||||
- * Invalid input coordinate. e.g a latitude > 90°.
|
||||
+ * Invalid input coordinate. e.g a latitude > 90 deg.
|
||||
*/
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_INVALID_COORD
|
||||
|
||||
/**
|
||||
- * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90°,
|
||||
+ * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90 deg,
|
||||
* or iterative convergence method failed.
|
||||
*/
|
||||
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN
|
||||
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/java.opt gdal-3.3.2-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.3.2-fedora/swig/java/java.opt 2021-09-01 11:48:26.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/swig/java/java.opt 2021-09-07 12:51:17.392932626 +0200
|
||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
||||
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
|
||||
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/configure.ac gdal-3.3.2-fedora-new/configure.ac
|
||||
--- gdal-3.3.2-fedora/configure.ac 2021-09-01 11:48:27.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/configure.ac 2021-09-07 12:51:19.001929383 +0200
|
||||
@@ -64,7 +64,7 @@ dnl warning #2304: non-explicit construc
|
||||
dnl warning #3280: declaration hides member
|
||||
dnl remark #11074: Inlining inhibited by limit max-size
|
||||
dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
|
||||
-AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
+#AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
|
||||
AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/doc/source/index.rst gdal-3.3.2-fedora-new/doc/source/index.rst
|
||||
--- gdal-3.3.2-fedora/doc/source/index.rst 2021-09-01 11:48:26.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/doc/source/index.rst 2021-09-07 12:51:18.542930304 +0200
|
||||
@@ -4,8 +4,6 @@ GDAL
|
||||
|
||||
.. include:: ./about_no_title.rst
|
||||
|
||||
-This documentation is also available as a `PDF file <gdal.pdf>`_.
|
||||
-
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/doc/Makefile gdal-3.3.2-fedora-new/doc/Makefile
|
||||
--- gdal-3.3.2-fedora/doc/Makefile 2021-09-01 11:48:26.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/doc/Makefile 2021-09-07 12:51:18.095931201 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
|
||||
# You can set these variables from the command line.
|
||||
-SPHINXOPTS ?= --keep-going -j auto -W
|
||||
+SPHINXOPTS ?= --keep-going
|
||||
SPHINXBUILD = sphinx-build
|
||||
SOURCEDIR = source
|
||||
BUILDDIR = build
|
||||
|
|
@ -1,24 +1,24 @@
|
|||
diff -rupN --no-dereference gdal-3.3.2-fedora/frmts/dods/GNUmakefile gdal-3.3.2-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.3.2-fedora/frmts/dods/GNUmakefile 2021-09-01 11:48:26.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/frmts/dods/GNUmakefile 2021-09-07 12:51:17.636932131 +0200
|
||||
diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.0.4-fedora/frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
|
||||
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
|
||||
|
||||
OBJ = dodsdataset2.o
|
||||
|
||||
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC)
|
||||
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -I/usr/include/tirpc
|
||||
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC)
|
||||
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
|
||||
|
||||
default: $(OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
|
||||
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-09-07 12:51:17.636932131 +0200
|
||||
diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
||||
+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
|
||||
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
|
||||
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
|
||||
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
|
||||
|
||||
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL
|
||||
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
|
||||
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
|
||||
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
|
||||
|
||||
default: $(O_OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdalautotest-3.3.3.tar.gz) = 942cc4a87653602e718f335bbdd80727475655e1e2a1993fda51df73a8ba5492c8fa365e0c3b61ee4a88d5044922065bf07247597798231d7e11a84249ed52b6
|
||||
SHA512 (gdal-3.3.3-fedora.tar.xz) = baed4740df4dc113c42041d71ab2857b567988cac2a0fade546931c3b2eff307685a14d07e39dc12cd1ef37faf4286a5ed1cf835ab201f3546c8963fcc57b261
|
||||
SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
|
||||
SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
|
||||
|
|
|
|||
Loading…
Reference in New Issue