gdal package is retired on c9s for CS-362
This commit is contained in:
Troy Dawson
parent
942d535dbe
commit
ad26faa7c8
59
.gitignore
vendored
59
.gitignore
vendored
@ -1,59 +0,0 @@
|
||||
gdal-1.7.2-fedora.tar.gz
|
||||
gdalautotest-1.7.0.tar.gz
|
||||
/gdal-1.7.3-fedora.tar.gz
|
||||
/gdalautotest-1.7.3.tar.gz
|
||||
/gdal-1.9.0-fedora.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
|
||||
@ -1,38 +0,0 @@
|
||||
gdal-1.9.1.tar.gz re-pack for Fedora
|
||||
|
||||
All files with pending legal questions are stripped from the original tarball,
|
||||
to form this tarball. Legal information is mainly from PROVENANCE.TXT
|
||||
|
||||
|
||||
No files are manipulated.
|
||||
|
||||
Please see the cleaning script clean-gdal.sh!
|
||||
|
||||
This leaves GDAL short of a few formats, coordinate systems and the PHP bindings.
|
||||
|
||||
Volker Fröhlich <volker27@gmx.at>
|
||||
|
||||
* updated to 1.9.1 by Volker Fröhlich <volker27@gmx.at>
|
||||
* updated to 1.9.0 by Volker Fröhlich <volker27@gmx.at>
|
||||
* updated to 1.7.3 by Viji V Nair <viji@fedoraproject.org>
|
||||
* updated to 1.7.2 by Sven Lankes <sven@lank.es>
|
||||
* updated to 1.7.1 by Balint Crisitan <cristian.balint@gmail.com>
|
||||
* updated to 1.6.1 by Dan Horak <dan@danny.cz>
|
||||
|
||||
|
||||
Removed files:
|
||||
========================================
|
||||
# due to uncertain license issues
|
||||
and derivative copy from ESRI (TM) and CubeWerx (TM):
|
||||
|
||||
data/cubewerx_extra.wkt
|
||||
data/esri_extra.wkt
|
||||
data/ecw_cs.wkt
|
||||
|
||||
Removed folders plus its contents:
|
||||
========================================
|
||||
# due to uncertain license issues these formats
|
||||
are removed and not suported in fedora pack:
|
||||
|
||||
frmts/bsb <-- http://www.osgeo.org/pipermail/gdal-dev/2003-September/001097.html
|
||||
swig/php <-- PHP license, incompatible mixture
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
||||
gdal package is retired on c9s for CS-362
|
||||
@ -1,11 +0,0 @@
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/swig/java/java.opt gdal-3.2.1-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.2.1-fedora/swig/java/java.opt 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/swig/java/java.opt 2021-01-04 21:49:35.504249023 +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,30 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
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
|
||||
|
||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||
|
||||
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
|
||||
|
||||
#Really necessary?
|
||||
rm -r swig/php
|
||||
|
||||
popd
|
||||
|
||||
|
||||
#TODO: Insert Provenance file
|
||||
|
||||
tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
||||
@ -1,33 +0,0 @@
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2020-12-29 13:19:32.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-01-04 21:49:36.914247237 +0100
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <limits>
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// CADVector
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-12-29 13:19:31.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-01-04 21:49:36.913247238 +0100
|
||||
@@ -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.2.1-fedora/third_party/LercLib/Lerc2.h gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h
|
||||
--- gdal-3.2.1-fedora/third_party/LercLib/Lerc2.h 2020-12-29 13:20:02.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h 2021-01-04 21:49:36.914247237 +0100
|
||||
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
|
||||
#include <limits>
|
||||
#include <string>
|
||||
#include <typeinfo>
|
||||
+#include <limits>
|
||||
#include "Defines.h"
|
||||
#include "BitMask.h"
|
||||
#include "BitStuffer2.h"
|
||||
@ -1,11 +0,0 @@
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/apps/GNUmakefile gdal-3.2.1-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/apps/GNUmakefile 2020-12-29 13:15:46.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/apps/GNUmakefile 2021-01-04 21:49:36.444247832 +0100
|
||||
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
|
||||
|
||||
install: default
|
||||
for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
|
||||
+ for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
|
||||
$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
|
||||
$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile 2021-01-04 21:49:35.992248405 +0100
|
||||
@@ -23,8 +23,7 @@ dist-clean: clean
|
||||
rm -rf $(DISTDIR)
|
||||
|
||||
$(ISOLIB): $(OBJ:.o=.$(OBJ_EXT))
|
||||
- $(AR) r $(ISOLIB) $?
|
||||
- $(RANLIB) $(ISOLIB)
|
||||
+ $(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
|
||||
|
||||
8211createfromxml$(EXE): 8211createfromxml.$(OBJ_EXT)
|
||||
$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -rupN gdal-3.2.1-fedora/configure.ac gdal-3.2.1-fedora-new/configure.ac
|
||||
--- gdal-3.2.1-fedora/configure.ac 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/configure.ac 2021-01-27 13:32:20.815040243 +0100
|
||||
@@ -61,7 +61,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.2.1-fedora/doc/source/index.rst gdal-3.2.1-fedora-new/doc/source/index.rst
|
||||
--- gdal-3.2.1-fedora/doc/source/index.rst 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/doc/source/index.rst 2021-01-04 21:49:36.681247532 +0100
|
||||
@@ -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.2.1-fedora/doc/Makefile gdal-3.2.1-fedora-new/doc/Makefile
|
||||
--- gdal-3.2.1-fedora/doc/Makefile 2020-12-29 13:15:46.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/doc/Makefile 2021-01-04 21:49:36.218248119 +0100
|
||||
@@ -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 +0,0 @@
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
|
||||
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
|
||||
|
||||
OBJ = dodsdataset2.o
|
||||
|
||||
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC)
|
||||
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
|
||||
|
||||
default: $(OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
|
||||
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
|
||||
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
|
||||
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
|
||||
|
||||
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
|
||||
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
|
||||
|
||||
default: $(O_OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
2
sources
2
sources
@ -1,2 +0,0 @@
|
||||
SHA512 (gdal-3.2.1-fedora.tar.xz) = bdc0f25c0bec5f9de48ae3ba53c75e2b19da39338d35dcb714948dded4cc5df9f9b951687d8b40205a37f83fbeb20d65d3fd2bcb60e4a5000a115487a01775b2
|
||||
SHA512 (gdalautotest-3.2.1.tar.gz) = 2cfa364b596bda8e0609fd31da8802f662ef0a3da09ba3a1e9444a855d2271a0d9f2191f4352aae5919d747f355a0573509f8ee5e117aa65bc605eb10d4d2ed8
|
||||
Loading…
Reference in New Issue
Block a user