- updated to 3.28.5

diff --git a/cmake-jni.patch b/cmake-jni.patch
index f11c273677620441661c85e28bf0aa26217f15fd..22feecf1c0d41cc20d3c55682c7fe41c941fcb8f 100644 (file)
--- a/cmake-jni.patch
+++ b/cmake-jni.patch
@@ -1,15 +1,15 @@
---- cmake-3.27.3/Modules/FindJNI.cmake.orig    2023-08-16 19:46:35.000000000 +0200
-+++ cmake-3.27.3/Modules/FindJNI.cmake 2023-08-23 18:20:08.029434273 +0200
+--- cmake-3.28.5/Modules/FindJNI.cmake.orig    2024-05-07 14:42:47.000000000 +0200
++++ cmake-3.28.5/Modules/FindJNI.cmake 2024-05-25 08:26:32.741070928 +0200
 @@ -141,7 +141,7 @@ macro(java_append_library_directories _v
-     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
-     # guess on the first part of the GNU config.guess platform triplet.
-     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
-+      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32" OR LIB_SUFFIX STREQUAL "x32")
-         set(_java_libarch "x32" "amd64" "i386")
-       else()
-         set(_java_libarch "amd64" "i386")
-@@ -272,56 +272,27 @@ if (WIN32)
+   # 1.6.0_18 + icedtea patches. However, it would be much better to base the
+   # guess on the first part of the GNU config.guess platform triplet.
+   if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-    if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++    if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32" OR LIB_SUFFIX STREQUAL "x32")
+       set(_java_libarch "x32" "amd64" "i386")
+     else()
+       set(_java_libarch "amd64" "i386")
+@@ -271,56 +271,27 @@ if (WIN32)
  endif()
  
  set(_JNI_JAVA_DIRECTORIES_BASE
@@ -78,23 +78,23 @@
  foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
    list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
      ${_java_dir}/jre/lib/{libarch}
-@@ -338,6 +309,7 @@ endforeach()
+@@ -337,6 +308,7 @@ endforeach()
  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
      ${_JNI_JAVA_AWT_LIBRARY_TRIES}
    )
 +endif()
  
  set(JAVA_JVM_LIBRARY_DIRECTORIES)
- foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -365,6 +337,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
+ foreach(dir IN LISTS JAVA_AWT_LIBRARY_DIRECTORIES)
+@@ -364,6 +336,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
    ${_JNI_JAVA_INCLUDE_TRIES}
    )
  
 +if(NOT _JAVA_HOME_EXPLICIT)
- foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
+ foreach(JAVA_PROG IN ITEMS "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
    get_filename_component(jpath "${JAVA_PROG}" PATH)
-   foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
-@@ -381,6 +354,7 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${J
+   foreach(JAVA_INC_PATH IN ITEMS ../include ../java/include ../share/java/include)
+@@ -380,6 +353,7 @@ foreach(JAVA_PROG IN ITEMS "${JAVA_RUNTI
      endif()
    endforeach()
  endforeach()

diff --git a/cmake.spec b/cmake.spec
index fd92643125d0098e291f029a5eb29c642d13fbc0..a15109dda24a5975d6dfe80fc0301888ed085f70 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,12 +17,12 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.27.6
+Version:       3.28.5
 Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       https://cmake.org/files/v3.27/%{name}-%{version}.tar.gz
-# Source0-md5: 900aad400c67bf40238e5c0119128549
+Source0:       https://cmake.org/files/v3.28/%{name}-%{version}.tar.gz
+# Source0-md5: 30cf6589ef90b252d0155e9884bd9221
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-jni.patch
@@ -230,6 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-commands.7*
 %{_mandir}/man7/cmake-compile-features.7*
 %{_mandir}/man7/cmake-configure-log.7*
+%{_mandir}/man7/cmake-cxxmodules.7*
 %{_mandir}/man7/cmake-developer.7*
 %{_mandir}/man7/cmake-env-variables.7*
 %{_mandir}/man7/cmake-file-api.7*