diff --git a/.gitignore b/.gitignore index 15f56ed..8e33792 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.6.1.tar.gz /gdal-3.6.1.tar.xz /gdal-3.6.1-fedora.tar.xz +/gdal-3.6.2-fedora.tar.xz diff --git a/gdal-fortify-source.patch b/gdal-fortify-source.patch index 5a02ebe..47519d5 100644 --- a/gdal-fortify-source.patch +++ b/gdal-fortify-source.patch @@ -1,7 +1,7 @@ -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 @@ +diff -rupN --no-dereference gdal-3.6.2-fedora/port/vsipreload.cpp gdal-3.6.2-fedora-new/port/vsipreload.cpp +--- gdal-3.6.2-fedora/port/vsipreload.cpp 2023-01-02 15:38:17.000000000 +0100 ++++ gdal-3.6.2-fedora-new/port/vsipreload.cpp 2023-01-05 09:09:34.828929089 +0100 +@@ -62,6 +62,17 @@ #undef _FORTIFY_SOURCE #endif diff --git a/gdal.spec b/gdal.spec index c664d50..094f566 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.6.1 -Release: 3%{?dist} +Version: 3.6.2 +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 Jan 05 2023 Sandro Mani - 3.6.2-1 +- Update to 3.6.2 + * Mon Jan 02 2023 Sandro Mani - 3.6.1-3 - Rebuild (mingw-cfitsio) diff --git a/gdal_utils.patch b/gdal_utils.patch index 494de45..67b72f5 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference gdal-3.6.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.2-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.6.2-fedora/frmts/iso8211/CMakeLists.txt 2023-01-02 15:38:16.000000000 +0100 ++++ gdal-3.6.2-fedora-new/frmts/iso8211/CMakeLists.txt 2023-01-05 09:09:34.553926914 +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.1-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.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 +diff -rupN --no-dereference gdal-3.6.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.6.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-01-02 15:38:17.000000000 +0100 ++++ gdal-3.6.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-01-05 09:09:34.554926922 +0100 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA gdal_standard_includes(ogr_S57) diff --git a/sources b/sources index 5c9f525..f841178 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (gdal-3.6.1-fedora.tar.xz) = 2c3d01a4140e5788713091562efd0ed5972419e746062f075558c0f66d9d5f2310c81859c9f8a2b6307bf81e89c059040bdd1ab18199fde847f1adf3942fbf3f -SHA512 (gdalautotest-3.6.1.tar.gz) = a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2 +SHA512 (gdal-3.6.2-fedora.tar.xz) = 44d1034d5ae2f36fa2ef923df955953d2634eb18b46540746b524451b3e6e0a1ab419648b3ac850dfa6a09115b3d78ded06b49cf690d284199121c73d8124512