commit 360c41c00b49bdfad22b31b31ca964fd35ff0695
Author: Jan Rękorajski <[email protected]>
Date: Thu Sep 6 20:18:48 2012 +0200
- fix building issues with latest bison
- don't unpack bootstrap ruby when not bootstraping
- release 2
fix-bison-invocation.patch | 11 +++++++++++
ruby.spec | 11 ++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/ruby.spec b/ruby.spec
index a89cb24..5af2bce 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -28,7 +28,7 @@ Summary(pt_BR.UTF-8): Linguagem de script orientada a objeto
Summary(zh_CN.UTF-8): ruby - 一种快速高效的面向对象脚本编程语言
Name: ruby
Version: %{basever}.%{patchlevel}
-Release: 1
+Release: 2
Epoch: 1
License: The Ruby License
Group: Development/Languages
@@ -47,6 +47,7 @@ Source5: testrb.1
Source6: %{name}-mode-init.el
Patch0: %{name}-lib64.patch
Patch1: %{name}-ffs.patch
+Patch2: fix-bison-invocation.patch
URL: http://www.ruby-lang.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -229,9 +230,17 @@ Ruby mode and debugger for Emacs.
Tryb Ruby i debugger dla Emacsa.
%prep
+%if %{with bootstrap}
%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2 -a3 -a100
+%else
+%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2 -a3
+%endif
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+
+# must be regenerated with new bison
+%{__rm} parse.{c,h}
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
diff --git a/fix-bison-invocation.patch b/fix-bison-invocation.patch
new file mode 100644
index 0000000..5b960f3
--- /dev/null
+++ b/fix-bison-invocation.patch
@@ -0,0 +1,11 @@
+--- ruby-1.9.3-p194/ext/ripper/depend~ 2010-12-26 14:25:10.000000000 +0100
++++ ruby-1.9.3-p194/ext/ripper/depend 2012-09-06 19:56:49.041137189 +0200
+@@ -16,7 +16,7 @@
+
+ .y.c:
+ $(ECHO) compiling compiler $<
+- $(Q) $(BISON) -t -v -oy.tab.c $<
++ $(Q) $(BISON) -d -t -v -oy.tab.c $<
+ $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!"
y.tab.c > $@
+ @$(RM) y.tab.c
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/360c41c00b49bdfad22b31b31ca964fd35ff0695
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
