Compare commits

...

146 Commits
f22 ... master

Author SHA1 Message Date
Björn Esser 4acfdb94d4 Re-enable annobin 2020-04-22 03:11:30 +02:00
Björn Esser b71668eb43 Temporarily disable annobin, as it is broken 2020-04-22 03:09:35 +02:00
Björn Esser 549d439c07 Rebuild (json-c) 2020-04-22 00:01:47 +02:00
Sandro Mani 9e38e2d06d Fix libtool wrappers installed for gdal utilities instead of actual binaries 2020-03-03 23:31:20 +01:00
Sandro Mani d89196fcc8 Update to 3.0.4 2020-03-03 15:20:35 +01:00
Fedora Release Engineering d9276d81d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 19:42:07 +00:00
Rich Mattes 271f3b41a8 Patch for new poppler and fix spec comment. 2020-01-18 13:26:39 -05:00
Mamoru TASAKA 1cc69e9b5f F-32: rebuild against new poppler 2020-01-18 15:59:24 +09:00
Elliott Sales de Andrade 7c9c61fb23 Simplify linking to Proj.
Just have gdal link to it, instead of dynamically loading it at runtime.
It's required by spatialite, so it would have been loaded already
anyway.
2019-09-17 22:47:22 -04:00
Sandro Mani eb65037468 Bump proj_somaj for proj 6 2019-09-16 13:57:04 +02:00
Devrim Gündüz fbb86216d7 Rebuild for new Proj 2019-09-04 15:55:22 +01:00
Devrim Gündüz 84f7799af6 Revert "Initial attempt for 3.0.1"
This reverts commit ff2c27b6ad.
2019-09-04 15:53:54 +01:00
Devrim Gündüz c81e815037 Revert "Update sources and .gitignore"
This reverts commit 7e28cb654d.
2019-09-04 15:53:48 +01:00
Devrim Gündüz 2abb6f806a Revert "Update gdal-cleaner.sh for 3.0.1"
This reverts commit 29e5bcd2a1.
2019-09-04 15:53:42 +01:00
Devrim Gündüz 29e5bcd2a1 Update gdal-cleaner.sh for 3.0.1 2019-09-04 11:39:46 +01:00
Devrim Gündüz 7e28cb654d Update sources and .gitignore 2019-09-04 11:36:52 +01:00
Devrim Gündüz ff2c27b6ad Initial attempt for 3.0.1 2019-09-04 11:35:51 +01:00
Devrim Gündüz c65e9fd02d GDAL: Start working on 3.0.1 update 2019-09-04 11:33:10 +01:00
Miro Hrončok 7f18204486 Rebuilt for Python 3.8 2019-08-19 10:14:25 +02:00
Fedora Release Engineering c2c377b4ca - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 01:36:23 +00:00
Jitka Plesnikova 9fcdbac218 Perl 5.30 rebuild 2019-06-01 20:21:53 +02:00
Orion Poplawski 473b2181e9 Rebuild for hdf5 1.10.5 2019-03-16 08:57:24 -06:00
Miro Hrončok 4cabc3d57d Drop Python 2 subpackage for mass Python 2 packages removal 2019-02-05 14:26:27 +01:00
Pavel Raiskup bcdd5c9b66 rpmlint fixes
Version: 2.3.2-6
2019-02-05 09:09:36 +01:00
Pavel Raiskup e15721acd3 gdal-java: modernize a bit
%add_maven_depmap got deprecated long time ago, and RPM keeps
warning about that.
According to guidelines, we should ship pom file that is provided
by the package.  There's pom.xml, which is substituted by
'ant maven' command (https://github.com/OSGeo/gdal/pull/879).

Version: 2.3.2-6
2019-02-05 08:52:01 +01:00
Devrim Gündüz 25767cf2be Update release number 2019-02-04 18:23:54 +00:00
Devrim Gündüz a7a2ddad2c use new maven macro 2019-02-04 18:22:53 +00:00
Devrim Gündüz 0a65b2b714 Rebuild for new GeOS and Proj 2019-02-04 18:20:00 +00:00
Fedora Release Engineering 690c4899be - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 20:41:11 +00:00
Igor Gnatenko 4c3f55fe5e Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:02 +01:00
Marek Kasik 6809e4088b Additional fixes for the rebuild 2019-01-26 02:42:44 +01:00
Marek Kasik e0a57edbca Rebuild for poppler-0.73.0 2019-01-25 19:48:12 +01:00
Igor Gnatenko bf6f773a83
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:39:01 +01:00
Pavel Raiskup 866b1a560e Flip the default Python to Python 3
Resolves: rhbz#1437185
2018-10-04 12:49:44 +02:00
Volker Fröhlich a80ef6d3ea New version 2.3.2 2018-10-03 00:37:00 +02:00
Pavel Raiskup e88db4a73f BuildRequires: s/postgresql-devel/libpq-devel/
That's because we moved libpq.so.5 into libpq package.

Related: rhbz#1618698, rhbz#1623764
2018-09-05 15:23:55 +02:00
José Matos 95779a228a rebuild for armadillo soname bump (take 2) 2018-08-27 11:42:15 +01:00
Pavel Raiskup 024a13db9a FTBFS fixes, perl/python/libtool
- drop RPATH according [1]
- fix perl build issue
- add BR tex(tabu.sty)
- don't hack the build system peculiarities, and rather build
  without --with-python/--with-perl
- use standard %py*{build,install} macros
- rename gdal-python3 to python3-gdal

Resolves: rhbz#1577185, rhbz#1606875

[1] https://fedoraproject.org/wiki/RPath_Packaging_Draft
2018-08-21 13:23:05 +02:00
José Matos 672d962609 rebuild for armadillo soname bump 2018-08-17 17:18:01 +01:00
Volker Fröhlich 1f54a99f5f New version 2.3.1
- g2clib and jni patch are not ready yet, therefore disable them
2018-08-14 23:57:00 +02:00
Marek Kasik 6e9a6ee2b5 Rebuild for poppler-0.67.0 2018-08-14 02:30:55 +02:00
Devrim Gündüz 304422c6f3 Fix #1606875 2018-07-25 09:21:56 +01:00
Dan Horák 8f6623dcd4 add BR: gcc-c++ 2018-07-19 14:05:21 +02:00
Fedora Release Engineering c3f4a8fd31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 01:12:27 +00:00
Petr Písař 3c67ae41c6 Perl 5.28 rebuild 2018-07-03 13:02:52 +02:00
Jitka Plesnikova e5b5abbbb3 Perl 5.28 rebuild 2018-06-29 22:04:02 +02:00
Orion Poplawski 7321db6dc3 Rebuild for libdap 3.19.1 2018-06-22 22:15:50 -06:00
Miro Hrončok 4eccddba3d Rebuilt for Python 3.7 2018-06-19 10:43:30 +02:00
Christian Dersch ad5822f3db rebuilt for cfitsio 3.450 2018-05-26 10:49:14 +02:00
Björn Esser 947e030b4d
Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28 2018-03-27 10:24:36 +02:00
Volker Froehlich b58934b125 Indentation and changelog date correction 2018-03-26 20:22:34 +02:00
Volker Froehlich 4fd87332ae New version 2.2.4 2018-03-26 20:18:44 +02:00
Adam Williamson b22b882d1e Rebuild for poppler 0.63.0 2018-03-23 16:36:06 -07:00
Björn Esser dc4282df47
Rebuilt for libjson-c.so.4 (json-c v0.13.1) 2018-03-06 15:15:11 +01:00
Christian Dersch 4458d4bc93 rebuilt for cfitsio 3.420 (so version bump) 2018-02-23 18:16:20 +01:00
David Tardon a881bad6c9 rebuild for poppler 0.62.0 2018-02-14 18:31:49 +01:00
Volker Froehlich 1c422b62b2 Don't own /etc/bash_completion.d (BZ#1545012) 2018-02-14 08:33:26 +01:00
Igor Gnatenko 85c338b411 Remove BuildRoot definition
None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-13 23:25:16 +01:00
Pavel Raiskup eafa4e3fc2 Silence some rpmlint warnings 2018-02-13 17:49:41 +01:00
Tom Hughes 3ff79ea9be Add patch for bug by node-gdal tests and fixed upstream
Resolves: fedora pr #6
2018-02-13 16:31:21 +01:00
Tom Hughes 80cb3fb4b1 Use libtirpc for RPC routines
Resolves: fedora pr #5
2018-02-13 16:27:45 +01:00
Pavel Raiskup 05f0231670 Revert "Rebuild (giflib)"
This reverts commit d2377e3126.

The reason is that there's less invasive method quite some time
proposed in PR#5.
2018-02-13 16:24:19 +01:00
Sandro Mani d2377e3126 Rebuild (giflib) 2018-02-13 10:46:29 +01:00
Fedora Release Engineering acc5c358a9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 10:43:28 +00:00
Than Ngo be11501cbf cleanup condition 2018-01-27 11:15:15 +01:00
Merlin Mathesius 8f92bd27de Cleanup spec file conditionals 2017-12-14 12:53:09 -06:00
Pavel Raiskup 567d9b4f89 spec: build depends on mariadb-connector-c-devel
Resolves: rhbz#1494096
Version: 2.2.3-4
2017-12-14 15:54:12 +01:00
Pavel Raiskup 793123a4c5 spec: disable bootstrap mode
Resolves: rhbz#1490492
Version: 2.2.3-4
2017-12-14 15:53:55 +01:00
Björn Esser 44c89eba51
Add patch to cleanly build against json-c v0.13 2017-12-11 20:51:13 +01:00
Björn Esser 414718a173
Rebuilt for libjson-c.so.3 2017-12-10 20:50:34 +01:00
Volker Fröhlich 552efb7294 New version 2.2.3 2017-12-04 20:58:15 +01:00
Volker Froehlich a908fcf372 Add gdalautotest to sources again 2017-11-30 18:48:53 +01:00
Volker Froehlich a859a0fc59 Re-enable bsb format (BZ#1432330)
Don't delete the bsb sources in our tarball
2017-11-30 18:43:16 +01:00
Volker Fröhlich a0abbc1f43 New version 2.2.2 2017-09-26 23:14:48 +02:00
Rex Dieter d57dd118cf rebuild (armadillo) 2017-09-17 16:33:22 -05:00
Rex Dieter b94928d4c6 add boostrap to Release tag, to make it more obvious 2017-09-11 13:47:01 -05:00
Rex Dieter e212be2bec support %bootstrap mode, enable for rawhide (#1490492) 2017-09-11 13:45:41 -05:00
Rex Dieter 68482c799b build_refman 0 (temporary bootstrap for missing texlive in rawhide)
segment POPPLER_OPTS, makes buildable on f25
2017-09-11 11:22:10 -05:00
David Tardon 6cfed6b7dd use upstream patch 2017-09-09 07:45:54 +02:00
David Tardon f17cd7bb3f rebuild for poppler 0.59.0 2017-09-08 10:12:23 +02:00
jdekloe b01296002f Update gdal.spec
reverse rename for g2clib, since it is renamed just the other way around.
2017-08-26 12:33:28 +00:00
Zbigniew Jędrzejewski-Szmek 665537b4d9 Add Provides for the old name without %_isa 2017-08-20 10:45:54 -04:00
Orion Poplawski 4a3a9c40a5 Handle new g2clib name in Fedora 27+ 2017-08-19 09:49:26 -06:00
Zbigniew Jędrzejewski-Szmek 3eae8f0594 Python 2 binary package renamed to python2-gdal 2017-08-19 09:38:19 -04:00
David Tardon 0f623fce81 rebuild for poppler 0.57.0 2017-08-03 12:40:46 +02:00
Fedora Release Engineering f49e427d04 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 21:00:07 +00:00
Fedora Release Engineering fa45de3d27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 09:10:37 +00:00
Adam Williamson 315e0ca0d7 Rebuild against MariaDB 10.2, update BuildRequires 2017-07-19 14:37:49 -07:00
Volker Fröhlich 0110c9e863 New version 2.1.4 2017-07-01 16:56:50 +02:00
Jitka Plesnikova ba7a65c400 Perl 5.26 rebuild 2017-06-04 08:31:01 +02:00
David Tardon e52a6c0934 rebuild for poppler 0.53.0 2017-03-28 15:31:26 +02:00
Sandro Mani 3c86a34a80 Rebuild (libwebp) 2017-02-01 19:21:54 +01:00
Volker Froehlich d729764f3c New version 2.1.3 (BZ #1417174)
Also disable tests by default (BZ#1260151)
2017-01-28 10:07:44 +01:00
Devrim Gündüz 59610265da Add a workaround for the pkg-config change in rawhide. 2017-01-24 16:33:28 +03:00
Devrim Gündüz 2a554de154 - Rebuilt for proj 4.9.3
- Fix many rpmlint warnings/errors.
2017-01-24 11:00:11 +03:00
Miro Hrončok 23f30fda35 Rebuild for Python 3.6 2016-12-19 18:20:36 +01:00
David Tardon cc5c35db4c rebuild for poppler 0.50.0 2016-12-16 15:34:44 +01:00
Orion Poplawski eca07d3c68 Add patch to fix build with jasper 2.0; Avoid duplicate unpacking of source 2016-12-01 09:47:05 -07:00
Orion Poplawski 64af99f708 Rebuild for jasper 2.0 2016-12-01 08:28:51 -07:00
David Tardon e2178abce5 rebuild for poppler 0.49.0 2016-11-23 15:38:24 +01:00
Volker Fröhlich 9975a280e7 Add tests to sources file 2016-10-31 00:16:33 +01:00
Volker Fröhlich 0ae310ce4a New version 2.1.2 2016-10-31 00:07:55 +01:00
Orion Poplawski 891ece6c99 Use system libjson-c 2016-10-22 09:14:07 -06:00
Marek Kasik b8c805801c Rebuild for poppler-0.48.0 2016-10-21 13:09:35 +02:00
Orion Poplawski 5c53a231ab Remove old patch 2016-08-12 11:57:09 -06:00
Orion Poplawski b9bc4f9077 Update to 2.1.1
- Add patch to fix bash-completion installation and install it (bug #1337143)
2016-08-12 11:44:01 -06:00
Fedora Release Engineering 9f6a4ae2b1 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 07:09:29 +00:00
Marek Kasik 687c780c8a Rebuild for poppler-0.45.0 2016-07-18 13:39:14 +02:00
Petr Písař 26d47cee1c Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl> 2016-06-24 09:26:48 +02:00
Jitka Plesnikova 40a97ccfb2 Perl 5.24 rebuild 2016-05-17 03:34:55 +02:00
Volker Fröhlich 9cb8bb0894 Add missing BR for libkml 2016-05-09 16:11:02 +02:00
Jozef Mlich 036a553c39 - Enable libKML support
Resolves: #1332008
2016-05-06 14:02:10 +02:00
Adam Williamson 01ce8ea63d rebuild for updated poppler 2016-05-03 13:38:41 -07:00
Marek Kasik 5b82fa15d1 Rebuild for poppler-0.43.0 2016-05-03 14:17:29 +02:00
Jozef Mlich dc820e44b2 Resolves: #1332175 new upstream version 2016-05-03 08:44:14 +02:00
Jozef Mlich 158e140af9 Rebuild for libdap change Resoloves: #1328104 2016-04-19 08:13:33 +02:00
Jozef Mlich 790d66da9a gdal needs rebuilding for change in libdap
Resolves: #1328104
2016-04-18 15:32:06 +02:00
Jozef Mlich 4bb081fc23 Resolves: #1213629
Adding Python 3 support
2016-02-21 10:51:35 +01:00
Volker Fröhlich 8b1cb1317b Add patch for GDAL issue #6360 2016-02-14 01:05:35 +01:00
Volker Fröhlich a79c2956fe Rebuild for Armadillo 6 2016-02-08 22:36:07 +01:00
Volker Froehlich 1f3d640006 New version 2.0.2; Fix geos support (#BZ1284714) 2016-02-04 19:21:44 +01:00
Dennis Gilmore e3e4901a08 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 21:05:49 +00:00
Marek Kasik 046514c204 Rebuild for poppler-0.40.0 2016-01-22 15:13:07 +01:00
Adam Jackson dc8f76e53b Rebuild for libdap soname bump 2016-01-15 13:59:50 -05:00
Igor Gnatenko 2123629e6d Rebuilt for libwebp soname bump
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2015-12-28 15:34:05 +01:00
Volker Fröhlich 589242a0b3 Solve BZ #1271906 (Build iso8211 and s57 utilities) 2015-10-20 00:38:57 +02:00
Volker Fröhlich abfe1e29d0 Update for 2.0.1
Also add manpage for Perl module
2015-09-25 08:59:57 +02:00
Orion Poplawski 5c198c2d45 Rebuild for libdap 3.15.1 2015-09-23 11:40:30 -06:00
Volker Fröhlich 51af4c6afc Add reference for dropping the Ruby bindings 2015-09-23 13:54:40 +02:00
Volker Fröhlich 0f3d608381 Correct typo 2015-09-21 23:20:24 +02:00
Volker Fröhlich 356cac6ef3 Add reference to upstream ticket 2015-09-21 23:18:58 +02:00
Volker Fröhlich adfd3a0b6e Support openjpeg2 2015-09-20 18:57:51 +02:00
Jonathan Wakely 36916369bf Rebuilt for Boost 1.59 2015-08-27 21:34:54 +01:00
Jonathan Wakely b0397c53bc Patch to set _XOPEN_SOURCE correctly (bug #1249703) 2015-08-09 09:11:56 +01:00
Volker Fröhlich 2f72042767 Version 2.0.0 2015-07-26 21:35:51 +02:00
Marek Kasik c4cc2f81bb Rebuild (poppler-0.34.0) 2015-07-22 16:26:23 +02:00
José Matos d336a38c2a Rebuild for armadillo 5(.xxx.y) 2015-07-03 09:51:49 +01:00
Dennis Gilmore 11931fb3ae - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 07:05:46 +00:00
Volker Fröhlich 00e0dd4bd7 Rebuild for Perl module_compat 2015-06-12 23:22:38 +02:00
Dan Horák 80e2b6a45d - add upstream patch for poppler >= 31 2015-06-09 22:07:19 +02:00
Jitka Plesnikova 922a996f03 Perl 5.22 rebuild 2015-06-06 18:17:28 +02:00
Devrim Gündüz 3e22a6c4a1 Apply patch in 1212215 for a better fix to the problem. 2015-05-21 12:54:35 +03:00
Devrim Gündüz 508845a99c Fix changelog date. 2015-05-21 12:51:31 +03:00
Devrim Gündüz c66334c86e - Fix proj soname in ogr/ogrct.cpp. Per report from Sandro Mani.
Fixes #1212215.
2015-05-21 12:50:31 +03:00
Orion Poplawski 2de989cd4c Rebuild for hdf5 1.8.15 2015-05-17 16:16:27 -06:00
Ralf Corsépius 89d1d4aed2 Rebuild for gcc-5.0.1 ABI changes. 2015-04-18 05:30:22 +02:00
12 changed files with 743 additions and 514 deletions

28
.gitignore vendored
View File

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

View File

@ -1,7 +1,7 @@
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 @@
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

View File

@ -1,6 +1,5 @@
#!/bin/bash
# Volker Fröhlich
VERSION="1.11.2"
VERSION="3.0.4"
tar xvf gdal-"${VERSION}".tar.xz
@ -12,8 +11,6 @@ rm data/esri_Wisconsin_extra.wkt
rm data/esri_StatePlane_extra.wkt
rm data/ecw_cs.wkt
rm -r frmts/bsb
#Really necessary?
rm -r swig/php

12
gdal-completion.patch Normal file
View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -1,6 +0,0 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gdal</groupId>
<artifactId>gdal-java-bindings</artifactId>
<version></version>
</project>

1031
gdal.spec

File diff suppressed because it is too large Load Diff

11
gdal_installapps.patch Normal file
View File

@ -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

13
gdal_iso8211.patch Normal file
View File

@ -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)

24
gdal_tirpcinc.patch Normal file
View File

@ -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))

View File

@ -1,2 +1,2 @@
f639373d0709858d41997c708ca80c52 gdal-1.11.2-fedora.tar.xz
3d4cb6361005312dc86016b0b7eb57a4 gdalautotest-1.11.2.tar.gz
SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72