diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 7254d8a..ec28253 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,21 +1,20 @@ -Index: cmake-3.14.0/Modules/FindRuby.cmake -=================================================================== ---- cmake-3.14.0.orig/Modules/FindRuby.cmake -+++ cmake-3.14.0/Modules/FindRuby.cmake +diff -up cmake-3.15.3/Modules/FindRuby.cmake.orig cmake-3.15.3/Modules/FindRuby.cmake +--- cmake-3.15.3/Modules/FindRuby.cmake.orig 2019-09-30 22:18:24.213679271 -0600 ++++ cmake-3.15.3/Modules/FindRuby.cmake 2019-09-30 22:19:24.177961574 -0600 @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO - _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) +- # 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.spec b/cmake.spec index 1080ae4..51f0525 100644 --- a/cmake.spec +++ b/cmake.spec @@ -52,7 +52,7 @@ %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %global major_version 3 -%global minor_version 14 +%global minor_version 15 # Set to RC version if building RC, else %%{nil} #global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} @@ -63,8 +63,8 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.5 -Release: 4%{?relsuf}%{?dist} +Version: %{major_version}.%{minor_version}.3 +Release: 1%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -480,6 +480,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Sep 30 2019 Orion Poplawski - 3.15.3-1 +- Update to 3.15.3 + * Wed Jul 24 2019 Fedora Release Engineering - 3.14.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 76f660c..75b3e66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.14.5.tar.gz) = 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46 +SHA512 (cmake-3.15.3.tar.gz) = 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658