Re-enable annobin

Temporarily disable annobin, as it is broken
Rebuild (json-c)
2020-04-22 03:11:30 +02:00 · 2020-04-22 03:09:35 +02:00 · 2020-04-22 00:01:47 +02:00 · 2020-03-03 23:31:20 +01:00 · 2020-03-03 15:20:35 +01:00 · 2020-01-28 19:42:07 +00:00
16 changed files with 1351 additions and 758 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +0,0 @@
-gdal-1.7.2-fedora.tar.gz
-gdalautotest-1.7.0.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,45 @@
+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
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: gdal
-# $Id: Makefile,v 1.1 2007/03/04 21:57:46 wtogami Exp $
-NAME := gdal
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/PROVENANCE.TXT-fedora
+++ b/PROVENANCE.TXT-fedora
@ -0,0 +1,38 @@
+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
--- a/gdal-1.9.0-java.patch
+++ b/gdal-1.9.0-java.patch
@ -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
+ 
+ 
--- a/gdal-bindir.patch
+++ b/gdal-bindir.patch
@ -1,15 +0,0 @@
-Create /usr/bin before attempting to compy anything there.
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-diff -up gdal-1.6.0-fedora/swig/python/GNUmakefile.bindir gdal-1.6.0-fedora/swig/python/GNUmakefile
--- gdal-1.6.0-fedora/swig/python/GNUmakefile.bindir	2009-03-22 23:25:47.582438890 +0100
-+++ gdal-1.6.0-fedora/swig/python/GNUmakefile	2009-03-22 23:26:10.465436318 +0100
-@@ -60,6 +60,7 @@ else
- 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
- endif
- 
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
- 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
- 
- docs:
--- a/gdal-cleaner.sh
+++ b/gdal-cleaner.sh
@ -0,0 +1,22 @@
+#!/bin/bash
+VERSION="3.0.4"
+
+tar xvf gdal-"${VERSION}".tar.xz
+
+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
--- a/gdal-completion.patch
+++ b/gdal-completion.patch
@ -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
--- a/gdal-libdap.patch
+++ b/gdal-libdap.patch
@ -1,24 +0,0 @@
-diff -up gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp
--- gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~	2008-09-09 16:49:39.000000000 +0200
-+++ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp	2008-09-09 16:50:05.000000000 +0200
-@@ -67,6 +67,8 @@ CPL_C_START
- void GDALRegister_DODS(void);
- CPL_C_END
- 
-+using namespace libdap ;
-+
- /** Attribute names used to encode geo-referencing information. Note that
-     these are not C++ objects to avoid problems with static global
-     constructors. 
-diff -up gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h
--- gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~	2008-09-09 16:50:50.000000000 +0200
-+++ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h	2008-09-09 16:51:19.000000000 +0200
-@@ -68,6 +68,8 @@
- #include <Error.h>
- #include <escaping.h>
- 
-+using namespace libdap ;
-+
- /************************************************************************/
- /*                           OGRDODSFieldDefn                           */
- /************************************************************************/
--- a/gdal-mysql.patch
+++ b/gdal-mysql.patch
@ -1,20 +0,0 @@
--- ogr/ogrsf_frmts/mysql/ogr_mysql.h.orig	2008-10-23 03:04:33.000000000 +0300
-+++ ogr/ogrsf_frmts/mysql/ogr_mysql.h	2009-02-02 22:47:05.000000000 +0200
-@@ -31,6 +31,8 @@
- #ifndef _OGR_MYSQL_H_INCLUDED
- #define _OGR_MYSQL_H_INCLUDED
- 
-+#include "ogrsf_frmts.h"
-+
- #include <my_global.h>
- #include <mysql.h>
- 
-@@ -38,8 +40,6 @@
- #undef bool
- #endif
- 
-#include "ogrsf_frmts.h"
-
- /************************************************************************/
- /*                            OGRMySQLLayer                             */
- /************************************************************************/
--- a/gdal.spec
+++ b/gdal.spec
--- a/gdal_installapps.patch
+++ b/gdal_installapps.patch
@ -0,0 +1,11 @@
+diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
+--- gdal-3.0.4-fedora/apps/GNUmakefile	2020-01-28 11:13:12.000000000 +0100
+++ gdal-3.0.4-fedora-new/apps/GNUmakefile	2020-03-03 23:17:41.032487778 +0100
+@@ -216,6 +216,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
+ 
+ install: default
+ 	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
+	for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
+ 	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
+ 	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
+ 
--- a/gdal_iso8211.patch
+++ b/gdal_iso8211.patch
@ -0,0 +1,13 @@
+diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
+--- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile	2020-02-06 00:24:10.382117696 +0100
+@@ -23,8 +23,7 @@ dist-clean:	clean
+ 	rm -rf $(DISTDIR)
+ 
+ $(ISOLIB):	$(OBJ:.o=.$(OBJ_EXT))
+-	$(AR) r $(ISOLIB) $?
+-	$(RANLIB) $(ISOLIB)
+	$(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
+ 
+ 8211createfromxml$(EXE):	8211createfromxml.$(OBJ_EXT)
+ 	$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)
--- a/gdal_tirpcinc.patch
+++ b/gdal_tirpcinc.patch
@ -0,0 +1,24 @@
+diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
+--- gdal-3.0.4-fedora/frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
+@@ -4,7 +4,7 @@ include ../../GDALmake.opt
+ 
+ OBJ	=	dodsdataset2.o
+ 
+-CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC)
+CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
+ 
+ default:	$(OBJ:.o=.$(OBJ_EXT))
+ 
+diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
+--- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
+@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
+ OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
+ 		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
+ 
+-CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
+CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
+ 
+ default:	$(O_OBJ:.o=.$(OBJ_EXT))
+ 
--- a/import.log
+++ b/import.log
@ -1,11 +0,0 @@
-gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145
-gdal-1_5_2-4_fc10:HEAD:gdal-1.5.2-4.fc10.src.rpm:1222777883
-gdal-1_5_3-1_fc10:HEAD:gdal-1.5.3-1.fc10.src.rpm:1224848682
-gdal-1_6_0-0_1_rc4_fc11:HEAD:gdal-1.6.0-0.1.rc4.fc11.src.rpm:1228594658
-gdal-1_6_0-0_2_rc4_fc11:HEAD:gdal-1.6.0-0.2.rc4.fc11.src.rpm:1228602531
-gdal-1_6_0-1_fc11:HEAD:gdal-1.6.0-1.fc11.src.rpm:1229050992
-gdal-1_6_0-2_fc11:HEAD:gdal-1.6.0-2.fc11.src.rpm:1233238875
-gdal-1_6_0-3_fc11:HEAD:gdal-1.6.0-3.fc11.src.rpm:1233609041
-gdal-1_6_0-4_fc11:HEAD:gdal-1.6.0-4.fc11.src.rpm:1233754182
-gdal-1_7_1-1_fc13:HEAD:gdal-1.7.1-1.fc13.src.rpm:1268888938
-gdal-1_7_1-2_fc13:HEAD:gdal-1.7.1-2.fc13.src.rpm:1268896464
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-1af25b221aeaa05c0925d3b1cc870f9a  gdal-1.7.2-fedora.tar.gz
-a952e4070066c04f9b2767bd1aaeda26  gdalautotest-1.7.0.tar.gz
+SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
+SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72