- updated to 3.15.2

diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index fe3782da59ed7aaeeca9c75ac569b21e8d97a0b9..d4451bfa4d0226ed94718a6a3b01cb1285c1d506 100644 (file)
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -13,20 +13,20 @@ Date:   Mon May 21 10:39:01 2012 -0600
 diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
 --- 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
 diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
 --- 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

-@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
-    _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-    _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+@@ -110,14 +110,8 @@
+   _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)
+-  # vendor_ruby available ?
+-  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)
--   endif()
-+   _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)

  
  

-    # 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)
+   # 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)

diff --git a/cmake-findruby2.patch b/cmake-findruby2.patch
index 45eb55b4456650bade7af439f0502face0fb074c..bdd9c3747da11fdfcf85c817317a3b93f0be8390 100644 (file)
--- a/cmake-findruby2.patch
+++ b/cmake-findruby2.patch
@@ -1,10 +1,10 @@
 --- cmake-2.8.12.2/Modules/FindRuby.cmake~     2014-08-26 22:03:46.000000000 +0200
 +++ cmake-2.8.12.2/Modules/FindRuby.cmake      2014-08-26 22:05:53.115892137 +0200
 @@ -170,6 +170,7 @@
 --- cmake-2.8.12.2/Modules/FindRuby.cmake~     2014-08-26 22:03:46.000000000 +0200
 +++ cmake-2.8.12.2/Modules/FindRuby.cmake      2014-08-26 22:05:53.115892137 +0200
 @@ -170,6 +170,7 @@

-    find_path(RUBY_CONFIG_INCLUDE_DIR
-      NAMES ruby/config.h  config.h
-      HINTS
-+     ${RUBY_HDR_DIR}
-      ${RUBY_HDR_DIR}/${RUBY_ARCH}
-      ${RUBY_ARCH_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}
+   )

diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index 358741fe0256b495ff5e5e5b03ef6fc9cc1f77c0..8eda9f7a4734e4a1f56498ae904060898143e408 100644 (file)
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -1,13 +1,13 @@
 --- cmake-2.4.10/Modules/KDE3Macros.cmake.orig 2012-11-03 08:29:52.205394821 +0100
 +++ cmake-2.4.10/Modules/KDE3Macros.cmake      2012-11-03 08:31:27.108749182 +0100
 @@ -336,7 +336,7 @@
 --- cmake-2.4.10/Modules/KDE3Macros.cmake.orig 2012-11-03 08:29:52.205394821 +0100
 +++ cmake-2.4.10/Modules/KDE3Macros.cmake      2012-11-03 08:31:27.108749182 +0100
 @@ -336,7 +336,7 @@

-    file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
-    file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
-    file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
--   file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
-+   file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")
+   file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
+   file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
+   file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
+-  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
++  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")

  
  

-    install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
+   install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})

  endmacro()
 --- cmake-3.1.0/Modules/FindZLIB.cmake~        2014-12-15 20:07:43.000000000 +0000
 +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000
  endmacro()
 --- cmake-3.1.0/Modules/FindZLIB.cmake~        2014-12-15 20:07:43.000000000 +0000
 +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000

diff --git a/cmake.spec b/cmake.spec
index 8991e97ee32a558c87a180c8c5bbabdadb6d355b..4995d550d46037f1d0fcff872cd9171c8fa6741a 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -15,12 +15,12 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake

-Version:       3.14.5
+Version:       3.15.2

 Release:       1
 License:       BSD
 Group:         Development/Building
 Release:       1
 License:       BSD
 Group:         Development/Building

-Source0:       https://cmake.org/files/v3.14/%{name}-%{version}.tar.gz
-# Source0-md5: a8cbfc3510b95ea686b4059d8b1f765c
+Source0:       https://cmake.org/files/v3.15/%{name}-%{version}.tar.gz
+# Source0-md5: 9ecf167edadb87e2d75cc89fded7aadb

 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-helpers.patch
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-helpers.patch