From e38130c1488c8db36d44c61895d65d92aeb12bffea5de286aea117ee1bc6ad36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 14 May 2012 14:31:24 +0000 Subject: [PATCH 1/3] Accepting request 120949 from home:coolo:branches:openSUSE:Factory - vendor-specific does no longer exist with ruby 1.9, so don't use it to check vendor support OBS-URL: https://build.opensuse.org/request/show/120949 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=89 --- cmake-fix-ruby-test.patch | 13 +++++++++++++ cmake.changes | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 cmake-fix-ruby-test.patch diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch new file mode 100644 index 0000000..3ddf18d --- /dev/null +++ b/cmake-fix-ruby-test.patch @@ -0,0 +1,13 @@ +Index: cmake-2.8.8/Modules/FindRuby.cmake +=================================================================== +--- cmake-2.8.8.orig/Modules/FindRuby.cmake 2012-04-18 20:10:54.000000000 +0200 ++++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-14 15:42:52.137253084 +0200 +@@ -93,7 +93,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) + + # vendor_ruby available ? +- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" ++ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].blank?" + OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) + + IF(RUBY_HAS_VENDOR_RUBY) diff --git a/cmake.changes b/cmake.changes index 96f7112..4b0456d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 14 13:43:06 UTC 2012 - coolo@suse.com + +- vendor-specific does no longer exist with ruby 1.9, so don't use + it to check vendor support + ------------------------------------------------------------------- Tue Apr 24 15:11:45 UTC 2012 - idonmez@suse.com From e8b19ca92c1de484f9ace0e63de9b830a3fbcdc39f4cd23a55f7520e441eff31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 15 May 2012 09:33:01 +0000 Subject: [PATCH 2/3] Actually apply the patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=90 --- cmake.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake.spec b/cmake.spec index def410b..3b57a5b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -23,6 +23,7 @@ Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-pkgconfig.patch +Patch3: cmake-fix-ruby-test.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -52,6 +53,7 @@ CMake is a cross-platform, open-source make system %setup -q %patch1 %patch2 -p1 +%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" From 2fbe2e431175b680a7b00a17f84e35f924fcaf6d96afbca9f866025e8360654f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 15 May 2012 11:17:41 +0000 Subject: [PATCH 3/3] use .nil? instead of .blank?, thanks to darix for pointing it out OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=91 --- cmake-fix-ruby-test.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index 3ddf18d..8731ab9 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -7,7 +7,7 @@ Index: cmake-2.8.8/Modules/FindRuby.cmake # vendor_ruby available ? - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].blank?" ++ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) IF(RUBY_HAS_VENDOR_RUBY)