SPECS: ruby.spec - up to 1.8.7p22; lib_prefix and vendordir seems to be mer...

[arekm]

Author: arekm                        Date: Fri Aug 15 19:57:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.8.7p22; lib_prefix and vendordir seems to be merged in some form; onigurma doesn't build so bcond off it; probably several CVE fixed

---- Files affected:
SPECS:
   ruby.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: SPECS/ruby.spec
diff -u SPECS/ruby.spec:1.175 SPECS/ruby.spec:1.176
--- SPECS/ruby.spec:1.175	Sat Jun 14 12:12:08 2008
+++ SPECS/ruby.spec	Fri Aug 15 21:57:51 2008
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - integrate vendordir patch
 # - include ext/ in docs
 # - replace ri with fastri
 # - patch ri to search multiple indexes (one per package), so RPMs can
@@ -10,6 +9,7 @@
 %bcond_without	doc	# skip generating docs (which is time-consuming). Intended for speed up test builds
 %bcond_without	emacs	# skip building package with ruby-mode for emacs
 %bcond_without	tk	# skip building package with Tk bindings
+%bcond_with	onigurma
 #
 %define		ruby_ver	1.8
 %define		ruby_ridir	%{_datadir}/ri/%{ruby_ver}/system
@@ -19,14 +19,14 @@
 Summary(pt_BR.UTF-8):	Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
-Version:	1.8.6
-Release:	6
+Version:	1.8.7
+Release:	1
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
-%define patchlevel 114
+%define patchlevel 22
 Source0:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-%{version}-p%{patchlevel}.tar.bz2
-# Source0-md5:	b4d0c74497f684814bcfbb41b7384a71
+# Source0-md5:	2d57acee0d80531e14ec0f6826a1f9fb
 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,9 +47,7 @@
 Source11:	testrb.1
 Source12:	%{name}-mode-init.el
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-LIB_PREFIX.patch
 Patch2:		%{name}-mkmf-shared.patch
-Patch4:		%{name}-vendordir.patch
 Patch5:		%{name}-lib64.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf
@@ -222,9 +220,7 @@
 %prep
 %setup -q -n %{name}-%{version}-p%{patchlevel} -a1 -a2 -a3 -a5 -a6 -a7 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch4 -p1
 %patch5 -p1
 
 find . -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
@@ -234,11 +230,13 @@
 %build
 cp -f /usr/share/automake/config.sub .
 
+%if %{with onigurma}
 cd oniguruma
 %configure \
 	--with-rubydir=..
 %{__make} 18
 cd ..
+%endif
 
 %{__autoconf}
 %configure \
@@ -460,6 +458,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2008/08/15 19:57:51  arekm
+- up to 1.8.7p22; lib_prefix and vendordir seems to be merged in some form; onigurma doesn't build so bcond off it; probably several CVE fixed
+
 Revision 1.175  2008/06/14 10:12:08  arekm
 - rel 6
 
================================================================

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