!92 修复源码包同源异构问题

From: @fly_fzc 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001

cmake-3.22.0-sw.patch

@@ -6,7 +6,7 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN
      elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
          set(_java_libarch "arm64" "aarch64")
 +    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64")
-+        set(_java_libarch "sw_64")
++        set(_java_libarch "sw_64" "sw64")
      elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
          set(_java_libarch "alpha")
      elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")

cmake.spec

@@ -11,7 +11,7 @@
 
 Name:           cmake
 Version:        3.22.0
-Release:        5
+Release:        10
 Summary:        Cross-platform make system
 License:        BSD and MIT and zlib
 URL:            http://www.cmake.org
@@ -24,9 +24,8 @@ 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
 BuildRequires:  emacs python3-devel pkgconfig(Qt5Widgets) desktop-file-utils
@@ -44,6 +43,9 @@ BuildRequires:  bzip2-devel curl-devel expat-devel jsoncpp-devel libarchive-deve
 BuildRequires:  libuv-devel xz-devel zlib-devel cmake-rpm-macros
 %endif
 
+BuildRequires:  pkgconfig(bash-completion)
+%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions')
+
 Requires:       cmake-data = %{version}-%{release} cmake-rpm-macros = %{version}-%{release}
 Requires:       cmake-filesystem = %{version}-%{release}
 Provides:       cmake3 = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys)
@@ -102,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
 
@@ -134,11 +144,6 @@ for f in ccmake cmake cpack ctest;
 do
  ln -s $f %{buildroot}%{_bindir}/${f}3;
 done
-install -d %{buildroot}%{_datadir}/bash-completion/completions
-for f in %{buildroot}%{_datadir}/cmake/completions/*
-do
-  ln -s ../../cmake/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions
-done
 install -d %{buildroot}%{_emacs_sitelispdir}/cmake
 install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el
@@ -204,12 +209,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files data -f data_files.mf
 %{_datadir}/aclocal/cmake.m4
-%{_datadir}/bash-completion
+%{bash_completionsdir}/c*
 %{_emacs_sitelispdir}/cmake
 %{_emacs_sitelispdir}/cmake-mode.el
 %{_emacs_sitestartdir}/cmake-init.el
 %{_datadir}/vim/vimfiles/indent/%{name}.vim
 %{_datadir}/vim/vimfiles//syntax/%{name}.vim
+%exclude %{_datadir}/cmake/Templates/Windows/Windows_TemporaryKey.pfx
 
 %files filesystem -f data_dirs.mf -f lib_dirs.mf
 
@@ -238,6 +244,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_pkgdocdir}/Copyright.txt
 
 %changelog
+* Thu Jan 23 2025 fuanan <fuanan3@h-partners.com> - 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
+
+* Fri Feb 2 2024 liyanan <liyanan61@h-partners.com> - 3.22.0-8
+- Remove Windows_TemporaryKey.pfx
+
+* Thu Dec 14 2023 liyanan <liyanan61@h-partners.com> - 3.22.0-7
+- Fix abnormal empty link in cmake-data package
+
+* Thu Aug 10 2023 herengui <herengui@kylinsec.com.cn> - 3.22.0-6
+- fix sw_64 portmidi Could NOT find JNI
+
 * Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 3.22.0-5
 - add sw64 patch
 

fix-messy-code-for-openssl-1.1.1wa-version.patch

@@ -0,0 +1,32 @@
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index 8474e05c..ac742855 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -520,7 +520,6 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+       from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+       # 96 is the ASCII code of 'a' minus 1
+       math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+-      unset(_tmp)
+       # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+       # this should be updated to handle that, too. This has not happened yet
+       # so it is simply ignored here for now.
+@@ -528,6 +527,16 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+     endif ()
+ 
+     set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
++
++    if ("${_tmp}" GREATER 26)
++      # openssl version 1.1.1wa get text directly
++      file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_text
++           REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[^\"]*\".*")
++      string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[a-zA-Z]+" version_number ${openssl_version_text})
++      set(OPENSSL_VERSION "${version_number}")
++    endif ()
++    unset(_tmp)
++
+   else ()
+     # Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
+     # a new OPENSSL_VERSION_STR macro contains exactly that
+-- 
+2.33.0
+