Update to 3.6.0
This commit is contained in:
Sandro Mani
parent
33a6cfdf66
commit
60f867e15f
2
.gitignore
vendored
2
.gitignore
vendored
@ -83,3 +83,5 @@ gdalautotest-1.7.0.tar.gz
|
||||
/gdalautotest-3.5.2.tar.gz
|
||||
/gdal-3.5.3-fedora.tar.xz
|
||||
/gdalautotest-3.5.3.tar.gz
|
||||
/gdal-3.6.0-fedora.tar.xz
|
||||
/gdalautotest-3.6.0.tar.gz
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
diff -rupN gdal-3.5.3-fedora/port/vsipreload.cpp gdal-3.5.3-fedora-new/port/vsipreload.cpp
|
||||
--- gdal-3.5.3-fedora/port/vsipreload.cpp 2022-10-21 16:57:18.000000000 +0200
|
||||
+++ gdal-3.5.3-fedora-new/port/vsipreload.cpp 2022-11-01 11:11:12.423024266 +0100
|
||||
@@ -46,6 +46,17 @@
|
||||
// LD_PRELOAD=./vsipreload.so ls -al /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
|
||||
// LD_PRELOAD=./vsipreload.so find /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
|
||||
diff -rupN --no-dereference gdal-3.6.0-fedora/port/vsipreload.cpp gdal-3.6.0-fedora-new/port/vsipreload.cpp
|
||||
--- gdal-3.6.0-fedora/port/vsipreload.cpp 2022-11-06 21:09:21.000000000 +0100
|
||||
+++ gdal-3.6.0-fedora-new/port/vsipreload.cpp 2022-11-11 18:33:22.896005450 +0100
|
||||
@@ -55,6 +55,17 @@
|
||||
#undef _FORTIFY_SOURCE
|
||||
#endif
|
||||
|
||||
+
|
||||
+/*
|
||||
|
||||
23
gdal.spec
23
gdal.spec
@ -50,8 +50,8 @@
|
||||
|
||||
|
||||
Name: gdal
|
||||
Version: 3.5.3
|
||||
Release: 2%{?dist}
|
||||
Version: 3.6.0
|
||||
Release: 1%{?pre:.%pre}%{?dist}
|
||||
Summary: GIS file format library
|
||||
License: MIT
|
||||
URL: http://www.gdal.org
|
||||
@ -81,6 +81,7 @@ BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
BuildRequires: armadillo-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: cfitsio-devel
|
||||
BuildRequires: CharLS-devel
|
||||
BuildRequires: curl-devel
|
||||
@ -106,6 +107,7 @@ BuildRequires: libspatialite-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: libwebp-devel
|
||||
BuildRequires: libzstd-devel
|
||||
%if 0%{?with_mysql}
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
%endif
|
||||
@ -155,6 +157,7 @@ BuildRequires: mingw32-sqlite
|
||||
BuildRequires: mingw32-xerces-c
|
||||
BuildRequires: mingw32-xz-libs
|
||||
BuildRequires: mingw32-zlib
|
||||
BuildRequires: mingw32-zstd
|
||||
|
||||
BuildRequires: mingw64-filesystem >= 102
|
||||
BuildRequires: mingw64-gcc-c++
|
||||
@ -184,6 +187,7 @@ BuildRequires: mingw64-sqlite
|
||||
BuildRequires: mingw64-xerces-c
|
||||
BuildRequires: mingw64-xz-libs
|
||||
BuildRequires: mingw64-zlib
|
||||
BuildRequires: mingw64-zstd
|
||||
%endif
|
||||
|
||||
# Python
|
||||
@ -466,8 +470,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
%files libs
|
||||
%license LICENSE.TXT
|
||||
%doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
|
||||
%{_libdir}/libgdal.so.31
|
||||
%{_libdir}/libgdal.so.31.*
|
||||
%{_libdir}/libgdal.so.32
|
||||
%{_libdir}/libgdal.so.32.*
|
||||
%{_datadir}/%{name}/
|
||||
%{_libdir}/gdalplugins/
|
||||
|
||||
@ -483,7 +487,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
%if %{with mingw}
|
||||
%files -n mingw32-%{name}
|
||||
%license LICENSE.TXT
|
||||
%{mingw32_bindir}/libgdal-31.dll
|
||||
%{mingw32_bindir}/libgdal-32.dll
|
||||
%{mingw32_bindir}/gdal-config
|
||||
%{mingw32_libdir}/libgdal.dll.a
|
||||
%{mingw32_libdir}/cmake/gdal/
|
||||
@ -496,7 +500,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
|
||||
%files -n mingw64-%{name}
|
||||
%license LICENSE.TXT
|
||||
%{mingw64_bindir}/libgdal-31.dll
|
||||
%{mingw64_bindir}/libgdal-32.dll
|
||||
%{mingw64_bindir}/gdal-config
|
||||
%{mingw64_libdir}/libgdal.dll.a
|
||||
%{mingw64_libdir}/cmake/gdal/
|
||||
@ -530,6 +534,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
%{_bindir}/gdalattachpct.py
|
||||
%{_bindir}/gdalcompare.py
|
||||
%{_bindir}/gdalmove.py
|
||||
%{_bindir}/ogr_layer_algebra.py
|
||||
%{_bindir}/ogrmerge.py
|
||||
%{_bindir}/pct2rgb.py
|
||||
%{_bindir}/rgb2pct.py
|
||||
@ -563,6 +568,12 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 11 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-1
|
||||
- Update to 3.6.0
|
||||
|
||||
* Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-0.1.rc1
|
||||
- Update to 3.6.0-rc1
|
||||
|
||||
* Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.5.3-2
|
||||
- Re-enable java
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -rupN --no-dereference gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200
|
||||
+++ gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt 2022-11-01 10:08:25.214006490 +0100
|
||||
diff -rupN --no-dereference gdal-3.6.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.0-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.6.0-fedora/frmts/iso8211/CMakeLists.txt 2022-11-06 21:09:20.000000000 +0100
|
||||
+++ gdal-3.6.0-fedora-new/frmts/iso8211/CMakeLists.txt 2022-11-11 18:33:22.642005448 +0100
|
||||
@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
|
||||
|
||||
# Because linking an OBJECT library
|
||||
@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt gdal-
|
||||
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
|
||||
+ install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif ()
|
||||
diff -rupN --no-dereference gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200
|
||||
+++ gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-11-01 10:08:25.215006490 +0100
|
||||
diff -rupN --no-dereference gdal-3.6.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.6.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-11-06 21:09:20.000000000 +0100
|
||||
+++ gdal-3.6.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-11-11 18:33:22.643005448 +0100
|
||||
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
|
||||
gdal_standard_includes(ogr_S57)
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (gdal-3.5.3-fedora.tar.xz) = 754a64bdd403de538ddc45f144ed0533493943c5e298445e300c6224c72ce58f2ca1dc71b18d88d04f351def04b1d7ead9682426d3fdd761b210ab1639afaf1f
|
||||
SHA512 (gdalautotest-3.5.3.tar.gz) = 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
|
||||
SHA512 (gdal-3.6.0-fedora.tar.xz) = 8156297a55b327e581eda15e0a10b594b8d4e887e1e098a796c9bcd1fc4ba61aad58d2bf81623f891b4d1170a59c064c67068b1cd2a45c06155ef1a00013af21
|
||||
SHA512 (gdalautotest-3.6.0.tar.gz) = bdc03de9f99d46780cce18ded034d9db44b112d886148489115f743b3843b3fb534583607a4d6fa2eafcac905d11446e1bebc41b62a9eafe93a0ee8c335167d7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user