[packages/ruby] up to 1.9.3-484 (2013-11-22)

glen glen at pld-linux.org
Sun Feb 16 15:46:16 CET 2014


commit aecb5ebeae816052459c8c761539b1c34b5c1900
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Feb 16 14:31:52 2014 +0000

    up to 1.9.3-484 (2013-11-22)

 bison3.patch | 21 ---------------------
 ruby.spec    |  8 +++-----
 2 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index fb8b771..0e7715e 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -11,10 +11,10 @@
 %bcond_without	batteries	# Don't include rubygems, json, rake, minitest
 %bcond_with	bootstrap	# build bootstrap version
 
-%define		rel		3
+%define		rel		1
 %define		ruby_version	1.9
 %define		basever		1.9.3
-%define		patchlevel	448
+%define		patchlevel	484
 %define		doc_version	1_9_3
 %define		json_ver	1.5.5
 %define		rake_ver	0.9.2.2
@@ -39,7 +39,7 @@ Epoch:		1
 License:	(Ruby or BSD) and Public Domain
 Group:		Development/Languages
 Source0:	ftp://ftp.ruby-lang.org/pub/ruby/1.9/%{name}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	aa710d386e5903f78f0231868255e6af
+# Source0-md5:	03f5b08804927ceabe5122cb90f5d0a9
 Source1:	http://www.ruby-doc.org/download/%{name}-doc-bundle.tar.gz
 # Source1-md5:	ad1af0043be98ba1a4f6d0185df63876
 Source2:	http://www.ruby-doc.org/downloads/%{name}_%{doc_version}_stdlib_rdocs.tgz
@@ -62,7 +62,6 @@ Patch5:		site-and-vendor-arch-flags.patch
 # Make mkmf verbose by default
 Patch6:		mkmf-verbose.patch
 Patch7:		strip-ccache.patch
-Patch8:		bison3.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -419,7 +418,6 @@ Biblioteka JSON dla języka Ruby.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
diff --git a/bison3.patch b/bison3.patch
deleted file mode 100644
index b1db7fd..0000000
--- a/bison3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ruby-1.9.3-p448/parse.y~	2013-04-11 04:21:43.000000000 +0200
-+++ ruby-1.9.3-p448/parse.y	2013-08-18 20:36:49.832045588 +0200
-@@ -277,8 +277,6 @@
- static int parser_yyerror(struct parser_params*, const char*);
- #define yyerror(msg) parser_yyerror(parser, (msg))
- 
--#define YYLEX_PARAM parser
--
- #define lex_strterm		(parser->parser_lex_strterm)
- #define lex_state		(parser->parser_lex_state)
- #define cond_stack		(parser->parser_cond_stack)
-@@ -610,7 +608,8 @@
- #endif
- %}
- 
--%pure_parser
-+%pure-parser
-+%lex-param   {struct parser_params *parser}
- %parse-param {struct parser_params *parser}
- 
- %union {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/aecb5ebeae816052459c8c761539b1c34b5c1900



More information about the pld-cvs-commit mailing list