From f09091b76230b9b2bfac57c4d4c34d89dc304c92 Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Thu, 23 Jan 2025 19:40:05 +0800 Subject: [PATCH] remove the architecture judgment in the patches section --- cmake.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index 4d489fc..2078c36 100644 --- a/cmake.spec +++ b/cmake.spec @@ -11,7 +11,7 @@ Name: cmake Version: 3.22.0 -Release: 9 +Release: 10 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -24,9 +24,7 @@ Source5: cmake.req Patch0: cmake-findruby.patch Patch1: cmake-fedora-flag_release.patch Patch2: cmake-mingw-dl.patch -%ifarch sw_64 Patch3: cmake-3.22.0-sw.patch -%endif Patch4: fix-messy-code-for-openssl-1.1.1wa-version.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed @@ -106,7 +104,15 @@ BuildArch: noarch Documentation for cmake. %prep -%autosetup -n cmake-%{version}%{?versuf} -p 1 +%setup -n cmake-%{version}%{?versuf} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%ifarch sw_64 +%patch3 -p1 +%endif +%patch4 -p1 + sed '1c #!%{__python3}' %{SOURCE4} > cmake.prov sed '1c #!%{__python3}' %{SOURCE5} > cmake.req @@ -238,6 +244,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Jan 23 2025 fuanan - 3.22.0-10 +- remove the architecture judgment in the patches section; +- include all patches in the source package. + * Sun Apr 28 2024 wangkai <13474090681@163.com> - 3.22.0-9 - Fix messy code for openssl-1.1.1wa version -- Gitee