From fc9266751291859d5318cd8c92ce0cc190b37df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 9 Feb 2023 23:37:20 +0100 Subject: [PATCH] cmake-3.26.0-rc2 Fixes rhbz#2167064 --- cmake.spec | 30 +++++++++++++++++++++--------- sources | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/cmake.spec b/cmake.spec index b1f9e20..1855303 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,11 +61,19 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 25 -# Set to RC version if building RC, else %%{nil} -#global rcsuf rc1 -%{?rcsuf:%global relsuf .%{rcsuf}} -%{?rcsuf:%global versuf -%{rcsuf}} +%global minor_version 26 +%global patch_version 0 + +# Set to RC version if building RC, else comment out. +%global rcsuf rc2 + +%if 0%{?rcsuf:1} +%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} +%global tar_version %{major_version}.%{minor_version}.%{patch_version}-%{rcsuf} +%else +%global pkg_version %{major_version}.%{minor_version}.%{patch_version} +%global tar_version %{major_version}.%{minor_version}.%{patch_version} +%endif # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -75,8 +83,8 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 -Release: %{baserelease}%{?relsuf}%{?dist} +Version: %{pkg_version} +Release: %{baserelease}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -86,7 +94,7 @@ Summary: Cross-platform make system # exception granting redistribution under terms of your choice License: BSD and MIT and zlib URL: http://www.cmake.org -Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{version}%{?versuf}.tar.gz +Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el Source2: macros.%{name} # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 @@ -272,7 +280,7 @@ This package contains common RPM macros for %{name}. %prep -%autosetup -n %{orig_name}-%{version}%{?versuf} -p 1 +%autosetup -n %{orig_name}-%{tar_version} -p 1 %if %{with rpm} %if %{with python3} @@ -521,6 +529,10 @@ popd %changelog +* Thu Feb 09 2023 Björn Esser - 3.26.0~rc2-1 +- cmake-3.26.0-rc2 + Fixes rhbz#2167064 + * Thu Jan 19 2023 Björn Esser - 3.25.2-1 - cmake-3.25.2 Fixes rhbz#2162459 diff --git a/sources b/sources index 40fb656..e434942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.2.tar.gz) = 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 +SHA512 (cmake-3.26.0-rc2.tar.gz) = 9738914eb4e1502df576ec04bb673ba486dbfa78726cda1ff4b852de8d958f4226602dae0c3f2b49e4984e4b3ce12fe8a8c6797faed4828f4ef7f814d5115cbd