add FindRuby patch from fedora auto/th/cmake-2.8.11-2
authorElan Ruusamäe <glen@delfi.ee>
Sat, 8 Jun 2013 19:01:42 +0000 (22:01 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sat, 8 Jun 2013 19:03:08 +0000 (22:03 +0300)
cmake-findruby.patch [new file with mode: 0644]
cmake.spec

diff --git a/cmake-findruby.patch b/cmake-findruby.patch
new file mode 100644 (file)
index 0000000..fe3782d
--- /dev/null
@@ -0,0 +1,32 @@
+commit 1d798ab1d961a075c1391fd20b49940b05af07bb
+Author: Orion Poplawski <orion@nwra.com>
+Date:   Wed Oct 24 19:54:09 2012 -0600
+
+    Update to 2.8.10 RC 3
+    Rebase FindRuby and FindPostgreSQL patches
+
+commit 0cf590138b7671c505d4d2800f85eabb40d175d7
+Author: Orion Poplawski <orion@cora.nwra.com>
+Date:   Mon May 21 10:39:01 2012 -0600
+
+    Add patch to fix FindRuby (bug 822796)
+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)
+-   # 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)
+    # 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)
index 65bfc1493fe2935425d335ad5e5e1e4c07e7a814..f731c9cc9c322b8b0c2bb15395688c0c283c7048 100644 (file)
@@ -12,13 +12,14 @@ Summary:    Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       2.8.11
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 # Source0-md5: be6008f2299613d23fe82ab53ef7472e
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-helpers.patch
+Patch2:                cmake-findruby.patch
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel
@@ -91,6 +92,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -118,7 +120,6 @@ export LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
This page took 0.045784 seconds and 4 git commands to generate.