From a299111fe199471d86ed9067aee3ba452c4e9d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Feb 2022 17:49:58 +0100 Subject: [PATCH] cmake-3.23.0-rc2 Fixes rhbz#2052100 --- cmake-findruby.patch | 8 ++++---- cmake-mingw-dl.patch | 6 +++--- cmake.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 23966a2..72a8b25 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.22.0-rc1/Modules/FindRuby.cmake +Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake =================================================================== ---- cmake-3.22.0-rc1.orig/Modules/FindRuby.cmake -+++ cmake-3.22.0-rc1/Modules/FindRuby.cmake -@@ -304,14 +304,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +--- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake ++++ cmake-3.23.0-rc2/Modules/FindRuby.cmake +@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ _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 8b0135e..9934788 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,7 +1,7 @@ -Index: cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake +Index: cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake =================================================================== ---- cmake-3.22.0-rc1.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake +--- cmake-3.23.0-rc2.orig/Modules/Platform/Windows-GNU.cmake ++++ cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake @@ -24,11 +24,11 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib diff --git a/cmake.spec b/cmake.spec index 42986e4..634b63e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,21 +61,21 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 22 +%global minor_version 23 # Set to RC version if building RC, else %%{nil} -#global rcsuf %%{nil} +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 0.1 # 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 +Version: %{major_version}.%{minor_version}.0 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,10 @@ popd %changelog +* Wed Feb 23 2022 Björn Esser - 3.23.0-0.1.rc2 +- cmake-3.23.0-rc2 + Fixes rhbz#2052100 + * Tue Jan 25 2022 Björn Esser - 3.22.2-1 - cmake-3.22.2 Fixes rhbz#2045074 diff --git a/sources b/sources index 48fcf1f..926ee6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.2.tar.gz) = 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f +SHA512 (cmake-3.23.0-rc2.tar.gz) = 12e11dc66a4f79faacb2f6ac503adda5b349b68c7d9b9d7824651cf77dd49b65d58fa5ff23e6e3c38e03ef60a2f34139a663261725cacec603db37cd42fae0da