From 9c9fe3d3147f7dceba30c78c2e783a5263e69afe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Thu, 8 Aug 2019 10:30:30 +0200 Subject: [PATCH] - updated to 3.15.2 --- cmake-findruby.patch | 28 ++++++++++++++-------------- cmake-findruby2.patch | 14 +++++++------- cmake-lib64.patch | 12 ++++++------ cmake.spec | 6 +++--- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index fe3782d..d4451bf 100644 --- 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 -@@ -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 45eb55b..bdd9c37 100644 --- 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 @@ - 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 358741f..8eda9f7 100644 --- 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 @@ - 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 diff --git a/cmake.spec b/cmake.spec index 8991e97..4995d55 100644 --- 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 -Version: 3.14.5 +Version: 3.15.2 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 -- 2.44.0