8 changed files with 160 additions and 302 deletions
--- a/.cmake.metadata
+++ b/.cmake.metadata
@ -1 +1 @@
-4b3ea5249e0d544c5d09a08b0e81f66a4963e5d7 SOURCES/cmake-3.17.2.tar.gz
+76bca3fc4614d72e32768d9cd6a88967c694ab5d SOURCES/cmake-3.26.5.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/cmake-3.17.2.tar.gz
+SOURCES/cmake-3.26.5.tar.gz
--- a/SOURCES/0001-Remove-pax-zstd-test.patch
+++ b/SOURCES/0001-Remove-pax-zstd-test.patch
@ -1,42 +0,0 @@
-From e1287c801aca417b740bc3a9f62df93a4c2c797e Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 26 May 2020 11:56:44 -0700
-Subject: [PATCH] Remove pax-zstd test
-
---
- Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake |  1 -
- Tests/RunCMake/CommandLineTar/pax-zstd.cmake     | 10 ----------
- 2 files changed, 11 deletions(-)
- delete mode 100644 Tests/RunCMake/CommandLineTar/pax-zstd.cmake
-
-diff --git a/Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake b/Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake
-index a64af95..4d1b396 100644
--- a/Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake
-@@ -27,7 +27,6 @@ run_cmake(gnutar)
- run_cmake(gnutar-gz)
- run_cmake(pax)
- run_cmake(pax-xz)
-run_cmake(pax-zstd)
- run_cmake(paxr)
- run_cmake(paxr-bz2)
- run_cmake(zip)
-diff --git a/Tests/RunCMake/CommandLineTar/pax-zstd.cmake b/Tests/RunCMake/CommandLineTar/pax-zstd.cmake
-deleted file mode 100644
-index c2a304d..0000000
--- a/Tests/RunCMake/CommandLineTar/pax-zstd.cmake
-+++ /dev/null
-@@ -1,10 +0,0 @@
-set(OUTPUT_NAME "test.tar.zstd")
-
-set(COMPRESSION_FLAGS cvf)
-set(COMPRESSION_OPTIONS --format=pax --zstd)
-
-set(DECOMPRESSION_FLAGS xvf)
-
-include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake)
-
-check_magic("28b52ffd0058" LIMIT 6 HEX)
-- 
-1.8.3.1
-
--- a/SOURCES/cmake-fedora-flag_release.patch
+++ b/SOURCES/cmake-fedora-flag_release.patch
@ -1,168 +0,0 @@
-Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
-@@ -1,7 +1,7 @@
- string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
- string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
-+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
- string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
- set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
- set(CMAKE_Fortran_MODPATH_FLAG "-p")
-Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
-@@ -1,7 +1,7 @@
- string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
- string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
-+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
- string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
- set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
- set(CMAKE_Fortran_VERBOSE_FLAG "-v")
-Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
-@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
-   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
-   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
-   string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
-  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-+  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG")
-   string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
-   set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
-   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
-@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
- 
- # No -DNDEBUG for Fortran.
- string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
-+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
- 
- # No -isystem for Fortran because it will not find .mod files.
- unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
-Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
-@@ -22,7 +22,7 @@ else()
-     string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
-     string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
-     string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
-    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
-+    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
-     string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
- 
-     set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
-Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
-@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
-   set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
-   string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
-   string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
-  string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-+  string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG")
-   string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
-   string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
- endif()
-Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
-@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
-   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
-   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
-   string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
-  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
-+  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
-   string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
- endmacro()
-Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
-@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
-   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
-   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
-   string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s")
-  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3")
-+  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2")
-   string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
- 
-   if(CMAKE_HOST_WIN32)
-Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
-@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
- string(APPEND CMAKE_ASM_FLAGS_INIT " ")
- string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
-string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
-+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
- string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
- 
- # Initialize ASM link type selection flags.  These flags are used when
-Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
-@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "
- string(APPEND CMAKE_C_FLAGS_INIT " ")
- string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
-string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
-+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
- string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
- 
- set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
-Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
-@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG
- string(APPEND CMAKE_CXX_FLAGS_INIT " ")
- string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
-string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
-+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
- string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
- 
- set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
-Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake
-+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
-@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA
- string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
- string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
- string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
-+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
- string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
- set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
- set(CMAKE_Fortran_MODPATH_FLAG "-M")
-Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
-+++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
-@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
- 
-     string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
-     string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
-    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
-+    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}")
-     string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
-   endif()
-   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
--- a/SOURCES/cmake-findruby.patch
+++ b/SOURCES/cmake-findruby.patch
@ -1,21 +1,20 @@
-Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake
-+++ cmake-3.17.0-rc1/Modules/FindRuby.cmake
-@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
-   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRuby.cmake
+--- cmake-3.18.2.orig/Modules/FindRuby.cmake	2020-09-08 13:30:51.129086854 +0000
+++ cmake-3.18.2/Modules/FindRuby.cmake	2020-09-10 07:10:56.679302608 +0000
+@@ -300,14 +300,8 @@
+   _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
+   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
 
 -  # vendor_ruby available ?
-  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
-    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
+-    OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
 -
-  if(RUBY_HAS_VENDOR_RUBY)
-    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  if(Ruby_HAS_VENDOR_RUBY)
+-    _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+-    _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
 -  endif()
 +  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
 +  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
 
   # save the results in the cache so we don't have to run ruby the next time again
-   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
+   set(Ruby_VERSION_MAJOR    ${Ruby_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
--- a/SOURCES/cmake-mingw-dl.patch
+++ b/SOURCES/cmake-mingw-dl.patch
@ -1,21 +0,0 @@
-Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
-===================================================================
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
-+++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
-@@ -25,12 +25,14 @@ endif()
- 
- if(MINGW)
-   set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
-+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
-   set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
-   set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
-+  set(CMAKE_DL_LIBS "dl")
-+else()
-+  set(CMAKE_DL_LIBS "")
- endif()
- 
-set(CMAKE_DL_LIBS "")
- set(CMAKE_LIBRARY_PATH_FLAG "-L")
- set(CMAKE_LINK_LIBRARY_FLAG "-l")
- set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
--- a/SOURCES/macros.cmake
+++ b/SOURCES/macros.cmake
@ -6,6 +6,9 @@
 %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %_cmake_version @@CMAKE_VERSION@@
 %__cmake /usr/bin/cmake
+%__ctest /usr/bin/ctest
+%__cmake_in_source_build 1
+%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}

 # - Set default compile flags
 # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
@ -24,6 +27,8 @@
  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
 %endif \
  %__cmake \\\
+        %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
+        %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
@ -36,6 +41,21 @@
 %if "%{?_lib}" == "lib64" \
        %{?_cmake_lib_suffix64} \\\
 %endif \
-	%{?_cmake_shared_libs}
+        %{?_cmake_shared_libs}
+
+%cmake_build \
+  %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
+
+%cmake_install \
+  DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
+
+%ctest(:-:) \
+  cd "%{__cmake_builddir}" \
+  %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
+  cd -
+

 %cmake@@CMAKE_MAJOR_VERSION@@ %cmake
+%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
+%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
+%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
--- a/SPECS/cmake.spec
+++ b/SPECS/cmake.spec
@ -32,15 +32,15 @@
 # Enable RPM dependency generators for cmake files written in Python
 %bcond_without rpm

-# Sphinx-build cannot import CMakeLexer on EPEL <= 6
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%bcond_with sphinx
-%else
 %bcond_without sphinx
-%endif

-%bcond_without bundled_libarchive
+%if !0%{?rhel}
+%bcond_with bundled_jsoncpp
+%bcond_with bundled_rhash
+%else
 %bcond_without bundled_jsoncpp
+%bcond_without bundled_rhash
+%endif

 # Run tests
 %bcond_without test
@ -58,19 +58,22 @@
 %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}

 %global major_version 3
-%global minor_version 17
+%global minor_version 26
 # Set to RC version if building RC, else %%{nil}
-#global rcsuf rc3
+#global rcsuf rc1
 %{?rcsuf:%global relsuf .%{rcsuf}}
 %{?rcsuf:%global versuf -%{rcsuf}}

+# For handling bump release by rpmdev-bumpspec and mass rebuild
+%global baserelease 2
+
 # Uncomment if building for EPEL
 #global name_suffix %%{major_version}
 %global orig_name cmake

 Name:           %{orig_name}%{?name_suffix}
-Version:        %{major_version}.%{minor_version}.2
-Release:        1%{?relsuf}%{?dist}
+Version:        %{major_version}.%{minor_version}.5
+Release:        %{baserelease}%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

 # most sources are BSD
@ -88,8 +91,6 @@ Source3:        %{name}.attr
 Source4:        %{name}.prov
 Source5:        %{name}.req

-ExclusiveArch: x86_64 aarch64 ppc64le s390x
-
 # Always start regular patches with numbers >= 100.
 # We need lower numbers for patches in compat package.
 # And this enables us to use %%autosetup
@ -99,14 +100,14 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
 # https://bugzilla.redhat.com/show_bug.cgi?id=822796
 Patch100:       %{name}-findruby.patch
 # replace release flag -O3 with -O2 for fedora
+%if 0%{?fedora} && 0%{?fedora} < 34
 Patch101:       %{name}-fedora-flag_release.patch
-# Add dl to CMAKE_DL_LIBS on MINGW
-# https://gitlab.kitware.com/cmake/cmake/issues/17600
-Patch102:       %{name}-mingw-dl.patch
-
-# --zstd option requires tar >= 1.31
-Patch103:       0001-Remove-pax-zstd-test.patch
+%endif

+# Patch for renaming on EPEL
+%if 0%{?name_suffix:1}
+Patch1:      %{name}-rename.patch
+%endif

 BuildRequires:  coreutils
 BuildRequires:  findutils
@ -132,17 +133,25 @@ BuildRequires:  %{_bindir}/sphinx-build
 BuildRequires:  bzip2-devel
 BuildRequires:  curl-devel
 BuildRequires:  expat-devel
-# Needed jsoncpp >= 1.4.1
-%if %{without bundled_jsoncpp}
+%if %{with bundled_jsoncpp}
+Provides: bundled(jsoncpp)
+%else
 BuildRequires:  jsoncpp-devel
 %endif
-# Needed libarchive >= 3.3.3
-%if %{without bundled_libarchive}
-BuildRequires:  libarchive-devel
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:  libarchive-devel  >= 3.3.3
+%else
+BuildRequires:  libarchive3-devel
 %endif
 BuildRequires:  libuv-devel
+%if %{with bundled_rhash}
+Provides:  bundled(rhash)
+%else
+BuildRequires:  rhash-devel
+%endif
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
+BuildRequires:  vim-filesystem
 %endif
 %if %{with emacs}
 BuildRequires:  emacs
@ -156,7 +165,6 @@ BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python2-devel
 %endif
 %endif
-#BuildRequires: xmlrpc-c-devel
 %if %{with gui}
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: pkgconfig(Qt5Widgets)
@ -166,15 +174,25 @@ BuildRequires: pkgconfig(QtGui)
 BuildRequires: desktop-file-utils
 %endif

+BuildRequires: pkgconfig(bash-completion)
+%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions')
+
 %if %{without bootstrap}
 # Ensure we have our own rpm-macros in place during build.
 BuildRequires:  %{name}-rpm-macros
 %endif
+BuildRequires: make

 Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-rpm-macros = %{version}-%{release}
 Requires:       %{name}-filesystem%{?_isa} = %{version}-%{release}

+# Explicitly require make.  (rhbz#1862014)
+Requires:       make
+
+# Provide the major version name
+Provides: %{orig_name}%{major_version} = %{version}-%{release}
+
 # Source/kwsys/MD5.c
 # see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
 Provides: bundled(md5-deutsch)
@ -182,12 +200,10 @@ Provides: bundled(md5-deutsch)
 # https://fedorahosted.org/fpc/ticket/555
 Provides: bundled(kwsys)

-%if %{with bundled_libarchive}
-Provides: bundled(libarchive) = 0:3.3.3
-%endif
-%if %{with bundled_jsoncpp}
-Provides: bundled(json-cpp) = 0:1.8.2
-%endif
+# The license files are shipped in both the cmake and cmake-doc packages and
+# can cause conflicts when updating.
+# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K
+Conflicts: cmake-doc < %{version}-%{release}

 %description
 CMake is used to control the software compilation process using simple
@ -208,6 +224,7 @@ Requires:       %{name}-rpm-macros = %{version}-%{release}
 Requires:       emacs-filesystem%{?_emacs_version: >= %{_emacs_version}}
 %endif
 %endif
+Requires:       vim-filesystem

 BuildArch:      noarch

@ -219,6 +236,11 @@ This package contains common data-files for %{name}.
 Summary:        Documentation for %{name}
 BuildArch:      noarch

+# The license files are shipped in both the cmake and cmake-doc packages and
+# can cause conflicts when updating.
+# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K
+Conflicts:      %{name} < %{version}-%{release}
+
 %description    doc
 This package contains documentation for %{name}.

@ -258,7 +280,6 @@ This package contains common RPM macros for %{name}.
 %prep
 %autosetup -n %{orig_name}-%{version}%{?versuf} -p 1

-
 %if %{with rpm}
 %if %{with python3}
 echo '#!%{__python3}' > %{name}.prov
@ -288,14 +309,13 @@ pushd %{_vpath_builddir}
 $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
                  --docdir=/share/doc/%{name} --mandir=/share/man \
                  --%{?with_bootstrap:no-}system-libs \
+                  --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \
+%if %{with bundled_rhash}
                  --no-system-librhash \
+%endif
 %if %{with bundled_jsoncpp}
                  --no-system-jsoncpp \
 %endif
-%if %{with bundled_libarchive}
-                  --no-system-libarchive \
-%endif
-                  --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
 %if %{with sphinx}
                  --sphinx-man --sphinx-html \
 %else
@ -315,19 +335,16 @@ find %{buildroot}%{_datadir}/%{name}/Modules -type f | xargs chmod -x
  echo "Found .orig files in %{_datadir}/%{name}/Modules, rebase patches" &&
  exit 1
 # Install major_version name links
-# Install bash completion symlinks
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-for f in %{buildroot}%{_datadir}/%{name}/completions/*
-do
-  ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions
-done
+%{!?name_suffix:for f in ccmake cmake cpack ctest; do ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done}
+
 %if %{with emacs}
 # Install emacs cmake mode
-mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name}
-install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
+mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} %{buildroot}%{_emacs_sitestartdir}
+mv %{buildroot}%{_emacs_sitelispdir}/%{name}-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
-mkdir -p %{buildroot}%{_emacs_sitestartdir}
 install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
+%else
+rm -f %{buildroot}%{_emacs_sitelispdir}
 %endif
 # RPM macros
 install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name}
@ -422,30 +439,30 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \

 %if %{with test}
 %check
-%if 0%{?rhel} && 0%{?rhel} <= 6
-mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
-%endif
 pushd %{_vpath_builddir}
 # CTestTestUpload require internet access
 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
-NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
+NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGINFO"
 # kwsys.testProcess-{4,5} are flaky on s390x.
 %ifarch s390x
 NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
 %endif
+
 # RunCMake.PrecompileHeaders test uses precompiled file presumably compiled with different compiler
 # that one of RHEL8 (GCC-8.3.1). See https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c4
 %if 0%{?rhel} && 0%{?rhel} > 7
 NO_TEST="$NO_TEST|RunCMake.PrecompileHeaders"
 %endif

-bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
-# Keep an eye on failing tests
-bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
-popd
-%if 0%{?rhel} && 0%{?rhel} <= 6
-mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
+# curl test may fail during bootstrap
+%if %{with bootstrap}
+NO_TEST="$NO_TEST|curl"
 %endif
+bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
+## do this only periodically, not for every build -- rdieter 20210429
+# Keep an eye on failing tests
+#bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
+popd
 %endif


@ -464,7 +481,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake

 %files data -f data_files.mf
 %{_datadir}/aclocal/%{name}.m4
-%{_datadir}/bash-completion
+%{bash_completionsdir}/c*
 %if %{with emacs}
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{_emacs_sitelispdir}/%{name}
@ -474,6 +491,8 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
 %{_emacs_sitestartdir}
 %endif
 %endif
+%{vimfiles_root}/indent/%{name}.vim
+%{vimfiles_root}/syntax/%{name}.vim


 %files doc
@ -511,6 +530,57 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake


 %changelog
+* Fri Nov 03 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-2
+- Fix conflict with license files.
+
+* Thu Oct 26 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-1
+- Update to version 3.26.5-1
+
+* Tue Jan 31 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-5
+- Fix test case broken by git fix for CVE-2022-39253
+
+* Fri Jul 09 2021 sguelton@redhat.com - 3.20.2-4
+- Fix update (rhbz#1964407)
+
+* Thu Jun 17 2021 sguelton@redhat.com - 3.20.2-3
+- Fix rhbz#1964392 and rhbz#1964407
+
+* Fri Jun 04 2021 sguelton@redhat.com - 3.20.2-2
+- Minimal libarchive req
+
+* Thu May 20 2021 sguelton@redhat.com - 3.20.2-1
+- Sync with Fedora rawhide. (#1957947)
+
+* Mon Jan 25 2021 Tom Stellard <tstellar@redhat.com> - 3.18.2-9
+- Sync macros from Fedora
+
+* Wed Oct 28 2020 sguelton@redhat.com - 3.18.2-8
+- External libarchive dependency
+
+* Mon Sep 21 2020 sguelton@redhat.com - 3.18.2-7
+- Call update-desktop-database upon install
+
+* Sat Sep 12 2020 sguelton@redhat.com - 3.18.2-6
+- Declare conflict with cmake due to license files
+
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-5
+- Declare conflict with cmake-doc due to license files
+
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-4
+- Build on all arches
+- Restore license file location
+- Restore previous appdata name
+
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-3
+- Fix bash-completion installation
+- keep license files in base location
+
+* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-2
+- Declare cmake vs old cmake-doc conflict
+
+* Thu Sep 10 2020 sguelton@redhat.com - 3.18.2-1
+- Update to cmake-3.18.2
+
 * Tue Apr 28 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.2-1
 - Update to cmake-3.17.2