From 308d6bea4300de62aa77d10a2736050fa4f1a2ba Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Thu, 23 Jan 2025 17:18:37 +0800 Subject: [PATCH] remove the architecture judgment in the patches section (cherry picked from commit 03c97679c8ec765dac6c99ec9b67d407a9505259) --- cmake.spec | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/cmake.spec b/cmake.spec index dc614f0..d4377ae 100644 --- a/cmake.spec +++ b/cmake.spec @@ -22,7 +22,7 @@ Name: cmake Version: 3.27.9 -Release: 5 +Release: 6 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -33,14 +33,9 @@ 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 - -%ifarch aarch64_ilp32 -Patch6000: backport-cmake-aarch64-ilp32-support.patch -%endif +Patch1: cmake-3.27.9-fix-cxx-standard-check-issue.patch +Patch2: cmake-3.22.0-sw.patch +Patch3: backport-cmake-aarch64-ilp32-support.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed @@ -133,7 +128,15 @@ BuildArch: noarch Documentation for cmake. %prep -%autosetup -n cmake-%{version}%{?versuf} -p 1 +%setup -n cmake-%{version}%{?versuf} +%patch 0 -p1 +%patch 1 -p1 +%ifarch sw_64 +%patch 2 -p1 +%endif +%ifarch aarch64_ilp32 +%patch 3 -p1 +%endif echo '#!%{__python3}' > %{name}.prov echo '#!%{__python3}' > %{name}.req @@ -299,6 +302,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Jan 23 2025 fuanan - 3.27.9-6 +- remove the architecture judgment in the patches section; +- include all patches in the source package. + * Thu Aug 22 2024 Dongxing Wang - 3.27.9-5 - Support %cmake_build and %cmake_install.