From 2453d167d7474b7a35b43961276cb9731c17c945 Mon Sep 17 00:00:00 2001 From: yangzhenyu Date: Wed, 4 Dec 2024 18:04:52 +0800 Subject: [PATCH] * remove the architecture judgment in the patches section Signed-off-by: yangzhenyu --- cmake.spec | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6f6b392..6f5098a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -28,7 +28,7 @@ Name: cmake Version: 3.27.9 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 7 +Release: 8 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: http://www.cmake.org @@ -39,14 +39,10 @@ Source3: cmake.attr Source4: cmake.prov Source5: cmake.req Patch0: cmake-findruby.patch -%ifarch sw_64 -Patch1: cmake-3.22.0-sw.patch -%endif -Patch2: cmake-3.27.9-fix-cxx-standard-check-issue.patch +Patch1: cmake-3.27.9-fix-cxx-standard-check-issue.patch -%ifarch aarch64_ilp32 -Patch6000: backport-cmake-aarch64-ilp32-support.patch -%endif +Patch6000: cmake-3.22.0-sw.patch +Patch6001: backport-cmake-aarch64-ilp32-support.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed @@ -139,7 +135,18 @@ BuildArch: noarch Documentation for cmake. %prep -%autosetup -n cmake-%{version}%{?versuf} -p 1 +%setup -n cmake-%{version}%{?versuf} +%autopatch -M600 -p1 + +%ifarch sw_64 +%patch 6000 -p1 +%endif + +%ifarch aarch64_ilp32 +%patch 6001 -p1 +%endif + + echo '#!%{__python3}' > %{name}.prov echo '#!%{__python3}' > %{name}.req @@ -316,6 +323,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Wed Dec 04 2024 yangzhenyu - 3.27.9-8 +- remove the architecture judgment in the patches section; +- include all patches in the source package. + * Tue Nov 05 2024 Funda Wang - 3.27.9-7 - change __cmake_builddir definition based on numeric comparision - force define source and binary directory -- Gitee