- up to 3.22.2

diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index d4451bfa4d0226ed94718a6a3b01cb1285c1d506..dca7e9d9fc0959fcf69ebe91732efb05d2bf7f8a 100644 (file)
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -14,19 +14,19 @@ diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modul
 --- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby   2012-10-02 10:12:18.000000000 -0600
 +++ cmake-2.8.10-rc1/Modules/FindRuby.cmake    2012-10-02 15:50:30.463292214 -0600
 @@ -110,14 +110,8 @@
-   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+   _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
+   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
  
 -  # vendor_ruby available ?
--  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
--    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
+-    OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
 -
--  if(RUBY_HAS_VENDOR_RUBY)
--    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
--    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  if(Ruby_HAS_VENDOR_RUBY)
+-    _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+-    _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
 -  endif()
-+  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
++  _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
++  _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
  
    # save the results in the cache so we don't have to run ruby the next time again
-   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
+   set(Ruby_VERSION_MAJOR    ${Ruby_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)

diff --git a/cmake-findruby2.patch b/cmake-findruby2.patch
index 2f6677fb5187a4f7131bff115203a16577132669..32fa6ef31055589bc0e21f4a861d8c5bb3c622c6 100644 (file)
--- a/cmake-findruby2.patch
+++ b/cmake-findruby2.patch
@@ -2,10 +2,10 @@ diff -urNp -x '*.orig' cmake-3.17.2.org/Modules/FindRuby.cmake cmake-3.17.2/Modu
 --- cmake-3.17.2.org/Modules/FindRuby.cmake    2021-04-12 22:19:23.761018307 +0200
 +++ cmake-3.17.2/Modules/FindRuby.cmake        2021-04-12 22:19:24.521040438 +0200
 @@ -207,6 +207,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" G
-   find_path(RUBY_CONFIG_INCLUDE_DIR
+   find_path(Ruby_CONFIG_INCLUDE_DIR
      NAMES ruby/config.h  config.h
      HINTS
-+      ${RUBY_HDR_DIR}
-       ${RUBY_HDR_DIR}/${RUBY_ARCH}
-       ${RUBY_ARCH_DIR}
-       ${RUBY_ARCHHDR_DIR}
++      ${Ruby_HDR_DIR}
+       ${Ruby_HDR_DIR}/${Ruby_ARCH}
+       ${Ruby_ARCH_DIR}
+       ${Ruby_ARCHHDR_DIR}

diff --git a/cmake.spec b/cmake.spec
index 9dfd3344776d26fc40e7c69330180b6947ce7343..820adf18bf599bc92a880022c4ceddd74b2b3261 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,12 +17,12 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.17.2
+Version:       3.22.2
 Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       https://cmake.org/files/v3.17/%{name}-%{version}.tar.gz
-# Source0-md5: fa62a3e1a736213f1d38dbe723550484
+Source0:       https://cmake.org/files/v3.22/%{name}-%{version}.tar.gz
+# Source0-md5: f96b91224aa14b09565325b51d60af43
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-helpers.patch
@@ -127,7 +127,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %if "%{_lib}" == "libx32"
 %patch1 -p1
 %endif
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1