Update to 3.8.0

This commit is contained in:
Sandro Mani 2023-11-15 11:51:14 +01:00
parent df64a19909
commit adeb164c34
4 changed files with 20 additions and 13 deletions

2
.gitignore vendored
View File

@ -102,3 +102,5 @@ gdalautotest-1.7.0.tar.gz
/gdalautotest-3.7.2.tar.gz
/gdal-3.7.3-fedora.tar.xz
/gdalautotest-3.7.3.tar.gz
/gdal-3.8.0-fedora.tar.xz
/gdalautotest-3.8.0.tar.gz

View File

@ -50,7 +50,7 @@
Name: gdal
Version: 3.7.3
Version: 3.8.0
Release: 1%{?dist}
Summary: GIS file format library
License: MIT
@ -381,6 +381,7 @@ cp -a %{SOURCE4} .
%cmake \
-DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
-DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \
-DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \
-DGDAL_USE_JPEG12_INTERNAL=OFF \
-DENABLE_DEFLATE64=OFF
%cmake_build
@ -445,6 +446,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
%{_bindir}/gdalbuildvrt
%{_bindir}/gdaldem
%{_bindir}/gdalenhance
%{_bindir}/gdal_footprint
%{_bindir}/gdalinfo
%{_bindir}/gdallocationinfo
%{_bindir}/gdalmanage
@ -472,8 +474,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.33
%{_libdir}/libgdal.so.33.*
%{_libdir}/libgdal.so.34
%{_libdir}/libgdal.so.34.*
%{_datadir}/%{name}/
%{_libdir}/gdalplugins/
@ -489,7 +491,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
%if %{with mingw}
%files -n mingw32-%{name}
%license LICENSE.TXT
%{mingw32_bindir}/libgdal-33.dll
%{mingw32_bindir}/libgdal-34.dll
%{mingw32_bindir}/gdal-config
%{mingw32_libdir}/libgdal.dll.a
%{mingw32_libdir}/cmake/gdal/
@ -502,7 +504,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
%files -n mingw64-%{name}
%license LICENSE.TXT
%{mingw64_bindir}/libgdal-33.dll
%{mingw64_bindir}/libgdal-34.dll
%{mingw64_bindir}/gdal-config
%{mingw64_libdir}/libgdal.dll.a
%{mingw64_libdir}/cmake/gdal/
@ -570,6 +572,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
%changelog
* Tue Nov 14 2023 Sandro Mani <manisandro@gmail.com> - 3.8.0-1
- Update to 3.8.0
* Fri Nov 03 2023 Sandro Mani <manisandro@gmail.com> - 3.7.3-1
- Update to 3.7.3

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.7.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.7.3-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.7.3-fedora/frmts/iso8211/CMakeLists.txt 2023-10-30 17:03:44.000000000 +0100
+++ gdal-3.7.3-fedora-new/frmts/iso8211/CMakeLists.txt 2023-11-03 18:58:27.663679053 +0100
diff -rupN --no-dereference gdal-3.8.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.0-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.8.0-fedora/frmts/iso8211/CMakeLists.txt 2023-11-09 10:51:01.000000000 +0100
+++ gdal-3.8.0-fedora-new/frmts/iso8211/CMakeLists.txt 2023-11-14 10:30:30.892535282 +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.7.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.7.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.7.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.7.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-10-30 17:03:44.000000000 +0100
+++ gdal-3.7.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-03 18:58:27.663679053 +0100
diff -rupN --no-dereference gdal-3.8.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.8.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-09 10:51:02.000000000 +0100
+++ gdal-3.8.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-14 10:30:30.892535282 +0100
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
gdal_standard_includes(ogr_S57)

View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.7.3-fedora.tar.xz) = f521a404396bad3a24280cad813030adfd4718560d2aa9756b96eded042fe20b7a87547d4f905c615180e1f7bcca075422bfb9319bc322d0f3bb2c67bbee5e57
SHA512 (gdalautotest-3.7.3.tar.gz) = e19d5afa9e7280a6ac837b01c23cddc7ff3ca6578ab347b915ec84bdde091f1b54095a2eed0042538eb4eae38613816d79531aa541f6cc6f1cbeee41b2fa11fd
SHA512 (gdal-3.8.0-fedora.tar.xz) = 100d752a55ecb3f6735be23bf3a3106fad20fb2b00edb7f99cc3df2b5fd603c169bedb8dde0d848ed0865319d14257a4cff14273a48bd79002212d95f683607a
SHA512 (gdalautotest-3.8.0.tar.gz) = e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431