diff --git a/.gitignore b/.gitignore index 7e4205c..b66bfd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/cmake-3.13.3.tar.gz -/cmake-3.13.4.tar.gz +/cmake-*.tar.gz diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch index 508c50f..4c03ff5 100644 --- a/cmake-fedora-flag_release.patch +++ b/cmake-fedora-flag_release.patch @@ -1,6 +1,7 @@ -diff -up cmake-3.13.1/Modules/Compiler/Absoft-Fortran.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/Absoft-Fortran.cmake ---- cmake-3.13.1/Modules/Compiler/Absoft-Fortran.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/Absoft-Fortran.cmake 2018-11-28 14:13:41.764320237 -0600 +Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/Absoft-Fortran.cmake ++++ cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -10,9 +11,10 @@ diff -up cmake-3.13.1/Modules/Compiler/Absoft-Fortran.cmake.fedora_flag_release string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") set(CMAKE_Fortran_MODPATH_FLAG "-p") -diff -up cmake-3.13.1/Modules/Compiler/G95-Fortran.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/G95-Fortran.cmake ---- cmake-3.13.1/Modules/Compiler/G95-Fortran.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/G95-Fortran.cmake 2018-11-28 14:13:41.764320237 -0600 +Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/G95-Fortran.cmake ++++ cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -22,10 +24,11 @@ diff -up cmake-3.13.1/Modules/Compiler/G95-Fortran.cmake.fedora_flag_release cma string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_VERBOSE_FLAG "-v") -diff -up cmake-3.13.1/Modules/Compiler/GNU.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/GNU.cmake ---- cmake-3.13.1/Modules/Compiler/GNU.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/GNU.cmake 2018-11-28 14:13:41.764320237 -0600 -@@ -43,7 +43,7 @@ macro(__compiler_gnu lang) +Index: cmake-3.14.0/Modules/Compiler/GNU.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/GNU.cmake ++++ cmake-3.14.0/Modules/Compiler/GNU.cmake +@@ -50,7 +50,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") @@ -34,10 +37,11 @@ diff -up cmake-3.13.1/Modules/Compiler/GNU.cmake.fedora_flag_release cmake-3.13. string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") -diff -up cmake-3.13.1/Modules/Compiler/GNU-Fortran.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/GNU-Fortran.cmake ---- cmake-3.13.1/Modules/Compiler/GNU-Fortran.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/GNU-Fortran.cmake 2018-11-28 14:13:41.765320245 -0600 -@@ -11,7 +11,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr +Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/GNU-Fortran.cmake ++++ cmake-3.14.0/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") @@ -46,9 +50,10 @@ diff -up cmake-3.13.1/Modules/Compiler/GNU-Fortran.cmake.fedora_flag_release cma # No -isystem for Fortran because it will not find .mod files. unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) -diff -up cmake-3.13.1/Modules/Compiler/Intel.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/Intel.cmake ---- cmake-3.13.1/Modules/Compiler/Intel.cmake.fedora_flag_release 2018-11-28 14:13:41.765320245 -0600 -+++ cmake-3.13.1/Modules/Compiler/Intel.cmake 2018-11-28 14:14:12.503566827 -0600 +Index: cmake-3.14.0/Modules/Compiler/Intel.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/Intel.cmake ++++ cmake-3.14.0/Modules/Compiler/Intel.cmake @@ -22,7 +22,7 @@ else() string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") @@ -58,10 +63,11 @@ diff -up cmake-3.13.1/Modules/Compiler/Intel.cmake.fedora_flag_release cmake-3.1 string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") -diff -up cmake-3.13.1/Modules/Compiler/NVIDIA-CUDA.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/NVIDIA-CUDA.cmake ---- cmake-3.13.1/Modules/Compiler/NVIDIA-CUDA.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/NVIDIA-CUDA.cmake 2018-11-28 14:13:41.766320253 -0600 -@@ -9,7 +9,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE +Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/NVIDIA-CUDA.cmake ++++ cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake +@@ -10,7 +10,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") @@ -70,9 +76,10 @@ diff -up cmake-3.13.1/Modules/Compiler/NVIDIA-CUDA.cmake.fedora_flag_release cma string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") endif() -diff -up cmake-3.13.1/Modules/Compiler/PathScale.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/PathScale.cmake ---- cmake-3.13.1/Modules/Compiler/PathScale.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/PathScale.cmake 2018-11-28 14:13:41.766320253 -0600 +Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/PathScale.cmake ++++ cmake-3.14.0/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") @@ -81,9 +88,10 @@ diff -up cmake-3.13.1/Modules/Compiler/PathScale.cmake.fedora_flag_release cmake + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") endmacro() -diff -up cmake-3.13.1/Modules/Compiler/PGI.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/PGI.cmake ---- cmake-3.13.1/Modules/Compiler/PGI.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/PGI.cmake 2018-11-28 14:13:41.766320253 -0600 +Index: cmake-3.14.0/Modules/Compiler/PGI.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/PGI.cmake ++++ cmake-3.14.0/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") @@ -93,9 +101,10 @@ diff -up cmake-3.13.1/Modules/Compiler/PGI.cmake.fedora_flag_release cmake-3.13. string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) -diff -up cmake-3.13.1/Modules/Compiler/SunPro-ASM.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/SunPro-ASM.cmake ---- cmake-3.13.1/Modules/Compiler/SunPro-ASM.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/SunPro-ASM.cmake 2018-11-28 14:13:41.767320261 -0600 +Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/SunPro-ASM.cmake ++++ cmake-3.14.0/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") @@ -105,10 +114,11 @@ diff -up cmake-3.13.1/Modules/Compiler/SunPro-ASM.cmake.fedora_flag_release cmak string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") # Initialize ASM link type selection flags. These flags are used when -diff -up cmake-3.13.1/Modules/Compiler/SunPro-C.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/SunPro-C.cmake ---- cmake-3.13.1/Modules/Compiler/SunPro-C.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/SunPro-C.cmake 2018-11-28 14:13:41.767320261 -0600 -@@ -15,7 +15,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG " +Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/SunPro-C.cmake ++++ cmake-3.14.0/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") @@ -117,10 +127,11 @@ diff -up cmake-3.13.1/Modules/Compiler/SunPro-C.cmake.fedora_flag_release cmake- string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF ") -diff -up cmake-3.13.1/Modules/Compiler/SunPro-CXX.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/SunPro-CXX.cmake ---- cmake-3.13.1/Modules/Compiler/SunPro-CXX.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/SunPro-CXX.cmake 2018-11-28 14:13:41.768320269 -0600 -@@ -15,7 +15,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG +Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/SunPro-CXX.cmake ++++ cmake-3.14.0/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") @@ -129,10 +140,11 @@ diff -up cmake-3.13.1/Modules/Compiler/SunPro-CXX.cmake.fedora_flag_release cmak string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF ") -diff -up cmake-3.13.1/Modules/Compiler/SunPro-Fortran.cmake.fedora_flag_release cmake-3.13.1/Modules/Compiler/SunPro-Fortran.cmake ---- cmake-3.13.1/Modules/Compiler/SunPro-Fortran.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Compiler/SunPro-Fortran.cmake 2018-11-28 14:13:41.768320269 -0600 -@@ -13,7 +13,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA +Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Compiler/SunPro-Fortran.cmake ++++ cmake-3.14.0/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") @@ -141,27 +153,3 @@ diff -up cmake-3.13.1/Modules/Compiler/SunPro-Fortran.cmake.fedora_flag_release string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_Fortran_MODDIR_FLAG "-moddir=") set(CMAKE_Fortran_MODPATH_FLAG "-M") -diff -up cmake-3.13.1/Modules/Platform/IRIX64.cmake.fedora_flag_release cmake-3.13.1/Modules/Platform/IRIX64.cmake ---- cmake-3.13.1/Modules/Platform/IRIX64.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Platform/IRIX64.cmake 2018-11-28 14:13:41.768320269 -0600 -@@ -37,7 +37,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCC) - set(CMAKE_CXX_CREATE_STATIC_LIBRARY - " -ar -o ") - set (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") -- set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG") -+ set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG") - set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") - endif() -diff -up cmake-3.13.1/Modules/Platform/IRIX.cmake.fedora_flag_release cmake-3.13.1/Modules/Platform/IRIX.cmake ---- cmake-3.13.1/Modules/Platform/IRIX.cmake.fedora_flag_release 2018-11-28 06:14:22.000000000 -0600 -+++ cmake-3.13.1/Modules/Platform/IRIX.cmake 2018-11-28 14:13:41.768320269 -0600 -@@ -7,7 +7,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX) - " -ar -o ") - set (CMAKE_CXX_FLAGS_INIT "") - set (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") -- set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG") -+ set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG") - set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") - set (CMAKE_C_FLAGS_INIT "") diff --git a/cmake-findruby.patch b/cmake-findruby.patch index aa8566f..7254d8a 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.10.0/Modules/FindRuby.cmake +Index: cmake-3.14.0/Modules/FindRuby.cmake =================================================================== ---- cmake-3.10.0.orig/Modules/FindRuby.cmake -+++ cmake-3.10.0/Modules/FindRuby.cmake -@@ -106,14 +106,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +--- cmake-3.14.0.orig/Modules/FindRuby.cmake ++++ cmake-3.14.0/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 --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch index 1f16d26..a83e378 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,6 +1,7 @@ -diff -rupN cmake-3.10.1/Modules/Platform/Windows-GNU.cmake cmake-3.10.1-new/Modules/Platform/Windows-GNU.cmake ---- cmake-3.10.1/Modules/Platform/Windows-GNU.cmake 2017-12-13 14:25:23.000000000 +0100 -+++ cmake-3.10.1-new/Modules/Platform/Windows-GNU.cmake 2017-12-30 15:32:03.253515499 +0100 +Index: cmake-3.14.0/Modules/Platform/Windows-GNU.cmake +=================================================================== +--- cmake-3.14.0.orig/Modules/Platform/Windows-GNU.cmake ++++ cmake-3.14.0/Modules/Platform/Windows-GNU.cmake @@ -28,9 +28,11 @@ if(MINGW) 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") diff --git a/cmake.spec b/cmake.spec index 1647a13..1ebf9c8 100644 --- a/cmake.spec +++ b/cmake.spec @@ -52,7 +52,7 @@ %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %global major_version 3 -%global minor_version 13 +%global minor_version 14 # Set to RC version if building RC, else %%{nil} #global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} @@ -63,7 +63,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.4 +Version: %{major_version}.%{minor_version}.0 Release: 1%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -479,6 +479,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Mar 15 2019 Björn Esser - 3.14.0-1 +- 3.14.0 + * Sat Feb 2 2019 Orion Poplawski - 3.13.4-1 - 3.13.4 diff --git a/sources b/sources index 27274ba..7bf0f3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.13.4.tar.gz) = 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93 +SHA512 (cmake-3.14.0.tar.gz) = a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400