- updated to 3.27.3

- added zlib patch to fix FindZLIB with 2-part zlib version (like 1.3)

diff --git a/cmake-jni.patch b/cmake-jni.patch
index cf9e3ecad7c212dfe25ff5be254234c244894774..f11c273677620441661c85e28bf0aa26217f15fd 100644 (file)
--- a/cmake-jni.patch
+++ b/cmake-jni.patch
@@ -1,6 +1,6 @@
---- cmake-3.22.2/Modules/FindJNI.cmake.orig    2022-01-25 14:45:06.000000000 +0100
-+++ cmake-3.22.2/Modules/FindJNI.cmake 2022-02-15 19:29:09.377305753 +0100
-@@ -52,7 +52,7 @@
+--- 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
+@@ -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")
@@ -9,7 +9,7 @@
          set(_java_libarch "x32" "amd64" "i386")
        else()
          set(_java_libarch "amd64" "i386")
-@@ -188,49 +188,27 @@ if (WIN32)
+@@ -272,56 +272,27 @@ if (WIN32)
  endif()
  
  set(_JNI_JAVA_DIRECTORIES_BASE
@@ -41,6 +41,13 @@
    # Arch Linux specific paths for default JVM
 -  /usr/lib/jvm/default
 -  # Ubuntu specific paths for default JVM
+-  /usr/lib/jvm/java-21-openjdk-{libarch}    # Ubuntu 23.04
+-  /usr/lib/jvm/java-20-openjdk-{libarch}    # Ubuntu 22.10
+-  /usr/lib/jvm/java-19-openjdk-{libarch}    # Ubuntu 22.04 LTS
+-  /usr/lib/jvm/java-18-openjdk-{libarch}    # Ubuntu 22.04 LTS
+-  /usr/lib/jvm/java-17-openjdk-{libarch}    # Ubuntu 18.04 LTS
+-  /usr/lib/jvm/java-16-openjdk-{libarch}    # Ubuntu 20.04 LTS
+-  /usr/lib/jvm/java-13-openjdk-{libarch}    # Ubuntu 20.04 LTS
 -  /usr/lib/jvm/java-11-openjdk-{libarch}    # Ubuntu 18.04 LTS
 -  /usr/lib/jvm/java-8-openjdk-{libarch}     # Ubuntu 15.10
 -  /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
@@ -71,7 +78,7 @@
  foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
    list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
      ${_java_dir}/jre/lib/{libarch}
-@@ -247,6 +225,7 @@ endforeach()
+@@ -338,6 +309,7 @@ endforeach()
  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
      ${_JNI_JAVA_AWT_LIBRARY_TRIES}
    )
@@ -79,7 +86,7 @@
  
  set(JAVA_JVM_LIBRARY_DIRECTORIES)
  foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -284,6 +263,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
+@@ -365,6 +337,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
    ${_JNI_JAVA_INCLUDE_TRIES}
    )
  
@@ -87,11 +94,11 @@
  foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
    get_filename_component(jpath "${JAVA_PROG}" PATH)
    foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
-@@ -300,6 +280,7 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${J
+@@ -381,6 +354,7 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${J
      endif()
    endforeach()
  endforeach()
 +endif()
  
  if(APPLE)
-   if(CMAKE_FIND_FRAMEWORK STREQUAL "ONLY")
+   if(DEFINED XCODE_VERSION)

diff --git a/cmake-zlib.patch b/cmake-zlib.patch
new file mode 100644 (file)
index 0000000..a53ab1e
--- /dev/null
+++ b/cmake-zlib.patch
@@ -0,0 +1,20 @@
+--- cmake-3.27.3/Modules/FindZLIB.cmake.orig   2023-08-16 19:46:35.000000000 +0200
++++ cmake-3.27.3/Modules/FindZLIB.cmake        2023-08-23 16:25:36.123237881 +0200
+@@ -179,9 +179,15 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_I
+ 
+     string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
+     string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
+-    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
+-    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
++    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}")
+ 
++    # only append a PATCH version if it exists:
++    set(ZLIB_VERSION_PATCH "")
++    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+)")
++          set(ZLIB_VERSION_PATCH "${CMAKE_MATCH_1}")
++          string(APPEND ZLIB_VERSION_STRING ".${ZLIB_VERSION_PATCH}")
++    endif()
++        
+     # only append a TWEAK version if it exists:
+     set(ZLIB_VERSION_TWEAK "")
+     if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")

diff --git a/cmake.spec b/cmake.spec
index 63396f7019494021b2f010aeb61fdd3d655ed671..2fa91a3a7973f7130b7a914ec9788ccf070e17fc 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -10,25 +10,26 @@
 #
 # Conditional build:
 %bcond_with    bootstrap       # use internal versions of some libraries
-%bcond_without gui             # don't build gui package
+%bcond_without gui             # gui package
 %bcond_with    tests           # perform "make test"
-%bcond_without doc             # don't build documentation
+%bcond_without doc             # documentation
 
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.24.3
+Version:       3.27.3
 Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       https://cmake.org/files/v3.24/%{name}-%{version}.tar.gz
-# Source0-md5: 226dd564164372f9f7d1e21e38e6e8c5
+Source0:       https://cmake.org/files/v3.27/%{name}-%{version}.tar.gz
+# Source0-md5: 7228f5fcc8a858fdeac27e29bda0c144
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-jni.patch
 Patch3:                %{name}-findruby.patch
 Patch4:                %{name}-findruby2.patch
 Patch5:                disable-completness-check.patch
+Patch6:                %{name}-zlib.patch
 URL:           https://cmake.org/
 # system zlib,bzip2,xz,zstd used only when without system libarchive
 %if %{with gui}
@@ -36,6 +37,7 @@ BuildRequires:        Qt5Core-devel >= 5.0
 BuildRequires: Qt5Gui-devel >= 5.0
 BuildRequires: Qt5Widgets-devel >= 5.0
 %endif
+BuildRequires: cppdap-devel
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 BuildRequires: jsoncpp-devel >= 1.6.2-2
@@ -138,9 +140,10 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
-      Modules/Compiler/XL-Fortran/cpp
+%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
+       Modules/Compiler/XL-Fortran/cpp
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -205,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-buildsystem.7*
 %{_mandir}/man7/cmake-commands.7*
 %{_mandir}/man7/cmake-compile-features.7*
+%{_mandir}/man7/cmake-configure-log.7*
 %{_mandir}/man7/cmake-developer.7*
 %{_mandir}/man7/cmake-env-variables.7*
 %{_mandir}/man7/cmake-file-api.7*

diff --git a/disable-completness-check.patch b/disable-completness-check.patch
index c3ec11e40bdbcdcdbc1cea2fc2ef5c69c9366e0f..05e3c8a04a64c4150c883aa404a8f71cd00b11a5 100644 (file)
--- a/disable-completness-check.patch
+++ b/disable-completness-check.patch
@@ -1,11 +1,11 @@
---- cmake-3.24.1/Source/cmExportInstallFileGenerator.cxx.orig  2022-08-17 18:54:57.000000000 +0200
-+++ cmake-3.24.1/Source/cmExportInstallFileGenerator.cxx       2022-09-27 11:07:37.195039337 +0200
-@@ -163,7 +163,7 @@ bool cmExportInstallFileGenerator::Gener
-   this->LoadConfigFiles(os);
+--- cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx.orig  2022-08-17 18:54:57.000000000 +0200
++++ cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx       2022-09-27 11:07:37.195039337 +0200
+@@ -181,7 +181,7 @@ bool cmExportInstallFileGenerator::Gener
+   }
  
    this->CleanupTemporaryVariables(os);
 -  this->GenerateImportedFileCheckLoop(os);
-+  //this->GenerateImportedFileCheckLoop(os);
++  // disabled for distro packages: this->GenerateImportedFileCheckLoop(os);
  
-   bool result = true;
    // Generate an import file for each configuration.
+   // Don't do this if we only export INTERFACE_LIBRARY targets.