[kdebindings] fix ruby_version checking, and building of krossruby
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 29 04:28:27 UTC 2010
commit e9274dee1bbaab53d3f9507f0107d912041c8f39
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Aug 28 23:32:54 2010 -0500
fix ruby_version checking, and building of krossruby
kdebindings-4.5.1-RUBY_VERSION.patch | 15 +++++++++++++++
kdebindings.spec | 5 +++++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/kdebindings-4.5.1-RUBY_VERSION.patch b/kdebindings-4.5.1-RUBY_VERSION.patch
new file mode 100644
index 0000000..a353ab6
--- /dev/null
+++ b/kdebindings-4.5.1-RUBY_VERSION.patch
@@ -0,0 +1,15 @@
+diff -up kdebindings-4.5.1/ruby/CMakeLists.txt.RUBY_VERSION kdebindings-4.5.1/ruby/CMakeLists.txt
+--- kdebindings-4.5.1/ruby/CMakeLists.txt.RUBY_VERSION 2010-08-27 03:11:01.000000000 -0500
++++ kdebindings-4.5.1/ruby/CMakeLists.txt 2010-08-28 23:30:45.517927327 -0500
+@@ -74,9 +74,9 @@ if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND
+ #include <ruby.h>
+ int main() { ruby_init(); return 0; }" RubyCompiles)
+ if(RubyCompiles)
+- if(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR = 1 AND RUBY_VERSION_MINOR < 9)
++ if(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND RUBY_VERSION_MINOR LESS 9)
+ set(BUILD_KrossRuby TRUE)
+- endif(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR = 1 AND RUBY_VERSION_MINOR < 9)
++ endif(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND RUBY_VERSION_MINOR LESS 9)
+ else(RubyCompiles)
+ message(STATUS "Failed to compile a C++ program that embeds ruby.")
+ endif(RubyCompiles)
diff --git a/kdebindings.spec b/kdebindings.spec
index 267dba5..1b22f1f 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -49,6 +49,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.
#Source0: kdebindings-1130463.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch50: kdebindings-4.5.1-RUBY_VERSION.patch
+
## upstream patches
## 4.5 branch
@@ -256,6 +259,8 @@ Falcon plugin for the Kross archtecture in KDE4.
%prep
%setup -q -n kdebindings-%{version}%{?alphatag}
+%patch50 -p1 -b .RUBY_VERSION
+
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list