diff --git a/.gitignore b/.gitignore index 1c02f43..3644f8f 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ gdalautotest-1.7.0.tar.gz /gdal-3.5.1-fedora.tar.xz /gdal-3.5.2-fedora.tar.xz /gdalautotest-3.5.2.tar.gz +/gdal-3.5.3-fedora.tar.xz +/gdalautotest-3.5.3.tar.gz diff --git a/gdal.spec b/gdal.spec index cb7ae34..6c141d7 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -383,10 +383,15 @@ cp -a %{SOURCE4} . %mingw_make_build %endif + %install %cmake_install + %if %{with mingw} %mingw_make_install +# Delete data from cross packages +rm -r %{buildroot}%{mingw32_datadir} +rm -r %{buildroot}%{mingw64_datadir} %endif # List of manpages for python scripts @@ -405,15 +410,12 @@ cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{name}/cpl_config.h mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch} cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config + %if %{with mingw} -# Delete data from cross packages -rm -r %{buildroot}%{mingw32_datadir} -rm -r %{buildroot}%{mingw64_datadir} - - %mingw_debug_install_post %endif + %if 0%{run_tests} %check %ctest || : @@ -555,6 +557,12 @@ rm -r %{buildroot}%{mingw64_datadir} %changelog +* Tue Nov 01 2022 Sandro Mani - 3.5.3-1 +- Update to 3.5.3 + +* Wed Oct 19 2022 Sandro Mani - 3.5.2-3 +- Rebuild (python-3.11) + * Fri Oct 7 2022 Tom Rix - 3.5.2-2 - Add mingw build conditional - Reduce java build condition to rhel 8 diff --git a/gdal_utils.patch b/gdal_utils.patch index f20fa52..21420d0 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt 2022-06-30 11:26:28.000000000 +0200 -+++ gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt 2022-07-06 13:21:14.754014199 +0200 +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 @@ -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.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.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-06-30 11:26:28.000000000 +0200 -+++ gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-07-06 13:21:14.754014199 +0200 +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 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA gdal_standard_includes(ogr_S57) diff --git a/sources b/sources index 9c6e3c8..1cf900c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.5.2-fedora.tar.xz) = ed6f2a5d370bfaed7266937e018abbafc60468c486699681a84be623b1b5ef20781973589f8840553d532b5e4a8a3d1691b7c6ab48a4e5ee714820abbaac391f -SHA512 (gdalautotest-3.5.2.tar.gz) = 92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2 +SHA512 (gdal-3.5.3-fedora.tar.xz) = 754a64bdd403de538ddc45f144ed0533493943c5e298445e300c6224c72ce58f2ca1dc71b18d88d04f351def04b1d7ead9682426d3fdd761b210ab1639afaf1f +SHA512 (gdalautotest-3.5.3.tar.gz) = 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e