From 91fb88163abef98fc0619a7678f76d881a025890 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 4 Jul 2025 09:36:24 +0800 Subject: [PATCH] 3.11.1 --- gdal-3.10.3.tar.xz => gdal-3.11.1.tar.xz | 4 +- gdal.spec | 28 +++++--------- gdal_utils.patch | 37 ------------------- ....10.3.tar.gz => gdalautotest-3.11.1.tar.gz | 4 +- 4 files changed, 14 insertions(+), 59 deletions(-) rename gdal-3.10.3.tar.xz => gdal-3.11.1.tar.xz (32%) delete mode 100644 gdal_utils.patch rename gdalautotest-3.10.3.tar.gz => gdalautotest-3.11.1.tar.gz (32%) diff --git a/gdal-3.10.3.tar.xz b/gdal-3.11.1.tar.xz similarity index 32% rename from gdal-3.10.3.tar.xz rename to gdal-3.11.1.tar.xz index 074ebe3..0278652 100644 --- a/gdal-3.10.3.tar.xz +++ b/gdal-3.11.1.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335a8d2c7567d783563d3fed37e8b58d72d9c1723f6fd1d8c299fe4c0d936781 -size 9208456 +oid sha256:21341b39a960295bd3194bcc5f119f773229b4701cd752499fbd850f3cc160fd +size 9308432 diff --git a/gdal.spec b/gdal.spec index f2b9fc5..f80fe47 100644 --- a/gdal.spec +++ b/gdal.spec @@ -22,7 +22,7 @@ %endif Name: gdal -Version: 3.10.3 +Version: 3.11.1 Release: 1 Summary: GIS file format library License: MIT @@ -34,8 +34,6 @@ Source2: cpl-config.h # Multilib compatible gdal-config script Source3: gdal-config -# Add some utils to the default install target -Patch0: gdal_utils.patch # Fix passing incompatible pointer type Patch1: gdal_incompatible-pointer-types.patch # Add definitions of missing int16_t and int32_t @@ -189,7 +187,6 @@ rm -rf frmts/gif/giflib rm -rf frmts/jpeg/libjpeg rm -rf frmts/jpeg/libjpeg12 rm -rf frmts/gtiff/libgeotiff -rm -rf frmts/gtiff/libtiff rm -rf mrf/LERCV1 rm -rf third_party/LercLib @@ -198,6 +195,7 @@ tar xf %{SOURCE1} mv %{name}autotest-%{version} autotest # Need to patch autotest +%autopatch -p1 # autotest/cpp uses private -O0 where it does not like any level of FORTIFY_SOURCE sed -i -e 's/-D_FORTIFY_SOURCE=2/%{?_fortify_level_flags}%{!?_fortify_level_flags:-Wp,-D_FORTIFY_SOURCE=2}/g' autotest/cpp/CMakeLists.txt sed -i "s/ \-O0)/)/g" ./autotest/cpp/CMakeLists.txt @@ -209,20 +207,10 @@ sed -i "s/ \-O0)/)/g" ./autotest/cpp/CMakeLists.txt -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_USE_JPEG12_INTERNAL=OFF \ -DENABLE_DEFLATE64=OFF \ - -DGDAL_USE_LERC_INTERNAL=OFF + -DGDAL_USE_LERC_INTERNAL=OFF \ + -DGDAL_USE_TIFF_INTERNAL=OFF %cmake_build -%if %{with mingw} -%mingw_cmake \ - -DBUILD_TESTING=OFF \ - -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ - -DGDAL_USE_JPEG12_INTERNAL=OFF \ - -DENABLE_DEFLATE64=OFF \ - -DGDAL_USE_LERC_INTERNAL=OFF -%mingw_make_build -%endif - - %install %cmake_install @@ -250,6 +238,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -f gdal_python_manpages_excludes.txt +%{_bindir}/gdal %{_bindir}/gdal2tiles %{_bindir}/gdal2xyz %{_bindir}/gdal_calc @@ -305,8 +294,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS -%{_libdir}/libgdal.so.36 -%{_libdir}/libgdal.so.36.* +%{_libdir}/libgdal.so.37 +%{_libdir}/libgdal.so.37.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -356,6 +345,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_jnidir}/%{name}/gdal-%{version}-javadoc.jar %changelog +* Fri Jul 04 2025 Funda Wang - 3.11.1-1 +- update to 3.11.1 + * Tue Apr 29 2025 Funda Wang - 3.10.3-1 - update to 3.10.3 diff --git a/gdal_utils.patch b/gdal_utils.patch deleted file mode 100644 index bd45d88..0000000 --- a/gdal_utils.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN --no-dereference gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 -+++ gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt 2025-02-15 07:17:31.661793475 +0100 -@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P - gdal_standard_includes(gdal_iso8211) - - # Because linking an OBJECT library --add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp) -+add_executable(8211dump 8211dump.cpp) - target_include_directories(8211dump PRIVATE $) - target_link_libraries(8211dump PRIVATE $ gdal_iso8211) -+install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - --add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp) -+add_executable(8211view 8211view.cpp) - target_include_directories(8211view PRIVATE $) - target_link_libraries(8211view PRIVATE $ gdal_iso8211) -+install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - --add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp) -+add_executable(8211createfromxml 8211createfromxml.cpp) - target_include_directories(8211createfromxml PRIVATE $) - target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) -+install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff -rupN --no-dereference gdal-3.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 -+++ gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-15 07:17:31.662050788 +0100 -@@ -27,7 +27,8 @@ set_property( - APPEND - PROPERTY RESOURCE "${GDAL_DATA_FILES}") - --add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp) -+add_executable(s57dump s57dump.cpp) - gdal_standard_includes(s57dump) - target_include_directories(s57dump PRIVATE $) - target_link_libraries(s57dump PRIVATE $ ogr_S57 gdal_iso8211) -+install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/gdalautotest-3.10.3.tar.gz b/gdalautotest-3.11.1.tar.gz similarity index 32% rename from gdalautotest-3.10.3.tar.gz rename to gdalautotest-3.11.1.tar.gz index c472d13..7b97415 100644 --- a/gdalautotest-3.10.3.tar.gz +++ b/gdalautotest-3.11.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e64a9a4bdfb1027d9dcb6d684bd7aa2a76f6612e18eca71897e4025ec4e1e097 -size 17694635 +oid sha256:e7be212a4a2cea273b9dd801fdf9325922bbb59586c6faff33dc3669b9886aac +size 18566466 -- Gitee