SPECS: ruby.spec - patch (-require-rubygems-version.patch) ruby againts an ...

[twittner]

Author: twittner                     Date: Wed Oct  1 13:47:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- patch (-require-rubygems-version.patch) ruby againts an error:
  /usr/lib/ruby/1.8/rdoc/ri/ri_paths.rb:62: uninitialized constant Gem::Version (NameError)
  when ruby-RubyGems is installed
- back to bz2 tarball
- renumber patches
- rel. 3

---- Files affected:
SPECS:
   ruby.spec (1.178 -> 1.179) 

---- Diffs:

================================================================
Index: SPECS/ruby.spec
diff -u SPECS/ruby.spec:1.178 SPECS/ruby.spec:1.179
--- SPECS/ruby.spec:1.178	Sat Sep 13 22:31:44 2008
+++ SPECS/ruby.spec	Wed Oct  1 15:47:37 2008
@@ -20,13 +20,13 @@
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
 Version:	1.8.7
-Release:	2
+Release:	3
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
 %define patchlevel 72
-Source0:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}-p%{patchlevel}.tar.gz
-# Source0-md5:	5e5b7189674b3a7f69401284f6a7a36d
+Source0:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}-p%{patchlevel}.tar.bz2
+# Source0-md5:	0b215c46b89b28d7ab8d56d96e72d5b9
 Source1:	http://www.ibiblio.org/pub/languages/ruby/doc/%{name}-texi-1.4-en.tar.gz
 # Source1-md5:	839fda4af52b5c5c6d21f879f7fc62bf
 Source2:	http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.tar.gz
@@ -47,8 +47,9 @@
 Source11:	testrb.1
 Source12:	%{name}-mode-init.el
 Patch0:		%{name}-info.patch
-Patch2:		%{name}-mkmf-shared.patch
-Patch5:		%{name}-lib64.patch
+Patch1:		%{name}-mkmf-shared.patch
+Patch2:		%{name}-require-rubygems-version.patch
+Patch3:		%{name}-lib64.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -220,8 +221,9 @@
 %prep
 %setup -q -n %{name}-%{version}-p%{patchlevel} -a1 -a2 -a3 -a5 -a6 -a7 
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
 
 find . -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
 	-o -name 'ruby.info*' -o -name '*.html' -o -name '*.tcl' -o -name '*.texi' \
@@ -459,6 +461,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2008/10/01 13:47:37  twittner
+- patch (-require-rubygems-version.patch) ruby againts an error:
+  /usr/lib/ruby/1.8/rdoc/ri/ri_paths.rb:62: uninitialized constant Gem::Version (NameError)
+  when ruby-RubyGems is installed
+- back to bz2 tarball
+- renumber patches
+- rel. 3
+
 Revision 1.178  2008/09/13 20:31:44  twittner
 - up to patchlevel 72
 - fix last fix (missing $RPM_BUILD_ROOT added)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ruby.spec?r1=1.178&r2=1.179&f=u