3.13.1

2018-11-28 17:57:52 -06:00 · 2018-11-28 17:57:52 -06:00 · cb4461c86c
commit cb4461c86c
parent d9aab735e2
4 changed files with 51 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1 @@
-/cmake-3.10.0.tar.gz
-/cmake-3.10.1.tar.gz
-/cmake-3.10.2.tar.gz
-/cmake-3.11.0.tar.gz
-/cmake-3.11.2.tar.gz
-/cmake-3.12.0.tar.gz
-/cmake-3.12.1.tar.gz
-/cmake-3.12.2.tar.gz
+/cmake-3.13.1.tar.gz
--- a/cmake-fedora-flag_release.patch
+++ b/cmake-fedora-flag_release.patch
@ -1,7 +1,6 @@
-diff -up cmake-3.12.0/.fedora_flag_release.orig cmake-3.12.0/.fedora_flag_release
-diff -up cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake	2018-07-27 08:51:37.486583595 -0500
+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
@@ -1,7 +1,7 @@
 string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
 string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@ -11,9 +10,9 @@ diff -up cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig cmake-3.12.0/Mo
 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.12.0/Modules/Compiler/G95-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake	2018-07-27 08:51:37.487583601 -0500
+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
@@ -1,7 +1,7 @@
 string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
 string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@ -23,10 +22,10 @@ diff -up cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake.orig cmake-3.12.0/Modul
 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.12.0/Modules/Compiler/GNU.cmake.orig cmake-3.12.0/Modules/Compiler/GNU.cmake
--- cmake-3.12.0/Modules/Compiler/GNU.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/GNU.cmake	2018-07-27 08:51:37.488583607 -0500
-@@ -40,7 +40,7 @@ macro(__compiler_gnu lang)
+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)
   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
   string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
@ -35,9 +34,9 @@ diff -up cmake-3.12.0/Modules/Compiler/GNU.cmake.orig cmake-3.12.0/Modules/Compi
   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>")
-diff -up cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake	2018-07-27 08:51:37.487583601 -0500
+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
 
 # No -DNDEBUG for Fortran.
@ -47,9 +46,9 @@ diff -up cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig cmake-3.12.0/Modul
 
 # No -isystem for Fortran because it will not find .mod files.
 unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
-diff -up cmake-3.12.0/Modules/Compiler/Intel.cmake.orig cmake-3.12.0/Modules/Compiler/Intel.cmake
--- cmake-3.12.0/Modules/Compiler/Intel.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/Intel.cmake	2018-07-27 08:51:37.489583613 -0500
+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
@@ -22,7 +22,7 @@ else()
     string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
     string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
@ -58,10 +57,10 @@ diff -up cmake-3.12.0/Modules/Compiler/Intel.cmake.orig cmake-3.12.0/Modules/Com
 +    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}" "-QdM" "-P" "-Za" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp")
-diff -up cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake
--- cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake	2018-07-27 08:51:37.490583619 -0500
+     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
   set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
   string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
@ -71,9 +70,9 @@ diff -up cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig cmake-3.12.0/Modul
   string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
   string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 endif()
-diff -up cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig cmake-3.12.0/Modules/Compiler/PathScale.cmake
--- cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/PathScale.cmake	2018-07-27 08:51:37.490583619 -0500
+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
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@ -82,9 +81,9 @@ diff -up cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig cmake-3.12.0/Modules
 +  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
   string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
 endmacro()
-diff -up cmake-3.12.0/Modules/Compiler/PGI.cmake.orig cmake-3.12.0/Modules/Compiler/PGI.cmake
--- cmake-3.12.0/Modules/Compiler/PGI.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/PGI.cmake	2018-07-27 08:51:37.492583631 -0500
+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
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
   string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@ -94,9 +93,9 @@ diff -up cmake-3.12.0/Modules/Compiler/PGI.cmake.orig cmake-3.12.0/Modules/Compi
   string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
 
   if(CMAKE_HOST_WIN32)
-diff -up cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake	2018-07-27 08:51:37.492583631 -0500
+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
@@ -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")
@ -106,9 +105,9 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig cmake-3.12.0/Module
 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.12.0/Modules/Compiler/SunPro-C.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-C.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-C.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/SunPro-C.cmake	2018-07-27 08:51:37.492583631 -0500
+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 "
 string(APPEND CMAKE_C_FLAGS_INIT " ")
 string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
@ -118,9 +117,9 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-C.cmake.orig cmake-3.12.0/Modules/
 string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
-diff -up cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake	2018-07-27 08:51:37.493583637 -0500
+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
 string(APPEND CMAKE_CXX_FLAGS_INIT " ")
 string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
@ -130,9 +129,9 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig cmake-3.12.0/Module
 string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
-diff -up cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake	2018-07-27 08:51:37.493583637 -0500
+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
 string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
 string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@ -142,9 +141,9 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig cmake-3.12.0/Mo
 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.12.0/Modules/Platform/IRIX64.cmake.orig cmake-3.12.0/Modules/Platform/IRIX64.cmake
--- cmake-3.12.0/Modules/Platform/IRIX64.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Platform/IRIX64.cmake	2018-07-27 08:51:37.492583631 -0500
+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
       "<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
@ -154,9 +153,9 @@ diff -up cmake-3.12.0/Modules/Platform/IRIX64.cmake.orig cmake-3.12.0/Modules/Pl
   set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
 endif()
-diff -up cmake-3.12.0/Modules/Platform/IRIX.cmake.orig cmake-3.12.0/Modules/Platform/IRIX.cmake
--- cmake-3.12.0/Modules/Platform/IRIX.cmake.orig	2018-07-17 06:29:00.000000000 -0500
-+++ cmake-3.12.0/Modules/Platform/IRIX.cmake	2018-07-27 08:51:37.491583625 -0500
+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)
       "<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
   set (CMAKE_CXX_FLAGS_INIT "")
--- a/cmake.spec
+++ b/cmake.spec
@ -52,7 +52,7 @@
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}

 %global major_version 3
-%global minor_version 12
+%global minor_version 13
 # 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}.2
+Version:        %{major_version}.%{minor_version}.1
 Release:        1%{?relsuf}%{?dist}
 Summary:        Cross-platform make system

@ -500,6 +500,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :


 %changelog
+* Wed Nov 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 3.13.1-1
+- 3.13.1
+
 * Sat Sep 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 3.12.2-1
 - Update to 3.12.2

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (cmake-3.12.2.tar.gz) = a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
+SHA512 (cmake-3.13.1.tar.gz) = 693520e53fa21e81f5f15e6f8979e5264e3bf7e194e4c19b884a44767b3b6d6535dee674f355440e7dcac480372882152c0523ac3c2f1c12d51b43540bcffa59