diff --git a/.gitignore b/.gitignore index a5b2bf6..530248a 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.5.3.tar.gz /gdal-3.6.0-fedora.tar.xz /gdalautotest-3.6.0.tar.gz +/gdalautotest-3.6.1.tar.gz +/gdal-3.6.1.tar.xz diff --git a/gdal-fortify-source.patch b/gdal-fortify-source.patch index bb4a0d8..5a02ebe 100644 --- a/gdal-fortify-source.patch +++ b/gdal-fortify-source.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference gdal-3.6.1-fedora/port/vsipreload.cpp gdal-3.6.1-fedora-new/port/vsipreload.cpp +--- gdal-3.6.1-fedora/port/vsipreload.cpp 2022-12-14 00:02:36.000000000 +0100 ++++ gdal-3.6.1-fedora-new/port/vsipreload.cpp 2022-12-15 20:52:13.229007790 +0100 @@ -55,6 +55,17 @@ #undef _FORTIFY_SOURCE #endif diff --git a/gdal.spec b/gdal.spec index 8dec8cb..eb4fdaa 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.6.0 -Release: 4%{?pre:.%pre}%{?dist} +Version: 3.6.1 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -568,6 +568,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Dec 15 2022 Sandro Mani - 3.6.1-1 +- Update to 3.6.1 + * Mon Dec 05 2022 Sandro Mani - 3.6.0-4 - Rebuild (mingw-xerces-c) diff --git a/gdal_utils.patch b/gdal_utils.patch index 438f50f..494de45 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference gdal-3.6.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.1-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.6.1-fedora/frmts/iso8211/CMakeLists.txt 2022-12-14 00:02:36.000000000 +0100 ++++ gdal-3.6.1-fedora-new/frmts/iso8211/CMakeLists.txt 2022-12-15 20:52:13.000007785 +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.6.0-fedora/frmts/iso8211/CMakeLists.txt gdal- target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) + install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif () -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 +diff -rupN --no-dereference gdal-3.6.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.6.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-12-14 00:02:36.000000000 +0100 ++++ gdal-3.6.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-12-15 20:52:13.000007785 +0100 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA gdal_standard_includes(ogr_S57) diff --git a/sources b/sources index 7ddc85d..2342a17 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.6.0-fedora.tar.xz) = 8156297a55b327e581eda15e0a10b594b8d4e887e1e098a796c9bcd1fc4ba61aad58d2bf81623f891b4d1170a59c064c67068b1cd2a45c06155ef1a00013af21 -SHA512 (gdalautotest-3.6.0.tar.gz) = bdc03de9f99d46780cce18ded034d9db44b112d886148489115f743b3843b3fb534583607a4d6fa2eafcac905d11446e1bebc41b62a9eafe93a0ee8c335167d7 +SHA512 (gdalautotest-3.6.1.tar.gz) = a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2 +SHA512 (gdal-3.6.1.tar.xz) = 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb