From 25e216943762e0d70b6385c3d8a749659a223241 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Jul 06 2022 11:22:17 +0000
Subject: Update to 3.5.1


---

diff --git a/gdal.spec b/gdal.spec
index 6124030..639afc5 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -33,15 +33,19 @@
 %if 0%{?rhel} >= 8
 %bcond_with java
 %else
+%ifarch %{java_arches}
 %bcond_without java
+%else
+%bcond_with java
+%endif
 %endif
 
-#global pre rc4
+#global pre rc1
 
 
 Name:          gdal
-Version:       3.5.0
-Release:       5%{?pre:%pre}%{?dist}
+Version:       3.5.1
+Release:       1%{?pre:.%pre}%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -61,7 +65,6 @@ Source5:       %{name}-cleaner.sh
 
 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
-Patch1:        gdal_libver.patch
 
 
 BuildRequires: cmake
@@ -527,11 +530,15 @@ rm -r %{buildroot}%{mingw64_datadir}
 %{_jnidir}/%{name}/libgdalalljni.so
 
 %files javadoc
-%{_jnidir}/%{name}/gdal-3.5.0-javadoc.jar
+%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar
 %endif
 
 
 %changelog
+* Wed Jul 06 2022 Sandro Mani <manisandro@gmail.com> - 3.5.1-1
+- Update to 3.5.1
+- Limit -java subpackage to %%java_arches
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.5.0-5
 - Rebuilt for Python 3.11
 
diff --git a/gdal_libver.patch b/gdal_libver.patch
deleted file mode 100644
index 6ae3797..0000000
--- a/gdal_libver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -rupN --no-dereference gdal-3.5.0-fedora/cmake/helpers/GdalVersion.cmake gdal-3.5.0-fedora-new/cmake/helpers/GdalVersion.cmake
---- gdal-3.5.0-fedora/cmake/helpers/GdalVersion.cmake	2022-05-10 16:03:37.000000000 +0200
-+++ gdal-3.5.0-fedora-new/cmake/helpers/GdalVersion.cmake	2022-05-16 12:38:04.503450282 +0200
-@@ -59,7 +59,7 @@ add_custom_target(generate_gdal_version_
-                     -P "${PROJECT_SOURCE_DIR}/cmake/helpers/generate_gdal_version_h.cmake"
-                   VERBATIM)
- 
--if (WIN32)
-+if (WIN32 AND NOT MINGW)
-   set(GDAL_SOVERSION "")
-   set(GDAL_ABI_FULL_VERSION "${GDAL_VERSION_MAJOR}${GDAL_VERSION_MINOR}")
- else()
-diff -rupN --no-dereference gdal-3.5.0-fedora/gdal.cmake gdal-3.5.0-fedora-new/gdal.cmake
---- gdal-3.5.0-fedora/gdal.cmake	2022-05-13 16:05:01.000000000 +0200
-+++ gdal-3.5.0-fedora-new/gdal.cmake	2022-05-16 12:38:04.503450282 +0200
-@@ -301,6 +301,10 @@ if (MSVC)
-       CACHE STRING "Postfix to add to the GDAL dll name for debug builds")
-   set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES DEBUG_POSTFIX "${GDAL_DEBUG_POSTFIX}")
- endif ()
-+if(MINGW)
-+    set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_NAME "${GDAL_LIB_OUTPUT_NAME}-${GDAL_SOVERSION}")
-+endif(MINGW)
-+
- 
- if (MSVC AND NOT BUILD_SHARED_LIBS)
-   target_compile_definitions(${GDAL_LIB_TARGET_NAME} PUBLIC CPL_DISABLE_DLL=)
diff --git a/gdal_utils.patch b/gdal_utils.patch
index 2ce3466..f20fa52 100644
--- a/gdal_utils.patch
+++ b/gdal_utils.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gdal-3.5.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.0-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.5.0-fedora/frmts/iso8211/CMakeLists.txt	2022-05-10 16:03:38.000000000 +0200
-+++ gdal-3.5.0-fedora-new/frmts/iso8211/CMakeLists.txt	2022-05-16 12:38:04.307447544 +0200
-@@ -12,15 +12,18 @@ gdal_standard_includes(gdal_iso8211)
+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
+@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
  
  # Because linking an OBJECT library
  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
@@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.5.0-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.5.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.5.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2022-05-10 16:03:38.000000000 +0200
-+++ gdal-3.5.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2022-05-16 12:38:04.307447544 +0200
+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
 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
  gdal_standard_includes(ogr_S57)