ruby.spec patch for ruby-1.8.7-p249

--- ruby.spec-org	2010-04-27 13:16:05.000000000 +0900
+++ ruby.spec	2010-05-13 07:09:41.000000000 +0900
@@ -1,13 +1,13 @@
 %define	rubyxver	1.8
-%define	rubyver		1.8.6
-%define _patchlevel	399
+%define	rubyver		1.8.7
+%define _patchlevel	249
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
 %define	sitedir		%{_libdir}/ruby/site_ruby
 # This is required to ensure that noarch files puts under /usr/lib/... for
 # multilib because ruby library is installed under /usr/{lib,lib64}/ruby anyway.
-%define	sitedir2	%{_prefix}/lib/ruby/site_ruby
+%define	sitedir2	%{_prefix}/%{_lib}/ruby/site_ruby
 %define	_normalized_cpu	%(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/' | sed -e 's|i.86|i386|'`)
 
 # emacs sitelisp directory
@@ -40,19 +40,19 @@
 Source4:	irb.1
 Source10:	ruby-mode-init.el
 
-Patch1:		ruby-deadcode.patch
-Patch20:	ruby-1.8.6-p383-rubyprefix.patch
-Patch21:	ruby-deprecated-sitelib-search-path.patch
-Patch22:	ruby-deprecated-search-path.patch
-Patch23:	ruby-multilib.patch
+#Patch1:		ruby-deadcode.patch
+#Patch20:	ruby-1.8.6-p383-rubyprefix.patch
+#Patch21:	ruby-deprecated-sitelib-search-path.patch
+#Patch22:	ruby-deprecated-search-path.patch
+#Patch23:	ruby-multilib.patch
 # Needed in 1.8.6-p287, no longer needed in 1.8.6-p368?
 #Patch25:	ruby-1.8.6.111-gcc43.patch
-Patch26:        ruby-1.8.6-rexml-CVE-2008-3790.patch
+#Patch26:        ruby-1.8.6-rexml-CVE-2008-3790.patch
 Patch27:        ruby-1.8.6-p287-CVE-2008-5189.patch
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
-Patch30:	ruby-openssl-1.0.patch
-Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
+#Patch30:	ruby-openssl-1.0.patch
+#Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
 # Patch32 from ruby_1_8 branch
 Patch32:	ruby-1.8head-irb-save-history.patch
 Patch33:	ruby-1.8.6-p383-mkmf-use-shared.patch
@@ -60,7 +60,7 @@
 # Patch34 disabled for now
 Patch34:	ruby-1.8.6-simplify-openssl-digest.patch
 # bz 580993
-Patch35:	ruby_1_8_7-gc-open4_096segv.patch
+#Patch35:	ruby_1_8_7-gc-open4_096segv.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -186,25 +186,25 @@
 tar fxz %{SOURCE1}
 popd
 pushd %{name}-%{arcver}
-%patch1 -p1
-%patch20 -p1
-%patch21 -p1
+#%patch1 -p1
+#%patch20 -p1
+#%patch21 -p1
 %ifarch ppc64 s390x sparc64 x86_64
-%patch22 -p1
-%patch23 -p1
+#%patch22 -p1
+#%patch23 -p1
 %endif
 #%patch25 -p1
 #%patch26 -p1
 %patch27 -p0
 %patch28 -p1
 %patch29 -p1
-%patch30 -p2
-%patch31 -p1
-%patch32 -p0
+#%patch30 -p2
+#%patch31 -p1
+#%patch32 -p0
 %patch33 -p1
 # Once kill patch34 due to build failure on actionpack
 #%%patch34 -p1
-%patch35 -p1
+#%patch35 -p1
 popd
 
 %build
@@ -389,7 +389,7 @@
 cd ..
 
 # remove shebang
-for i in $RPM_BUILD_ROOT%{_prefix}/lib/ruby/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; do
+for i in $RPM_BUILD_ROOT%{_prefix}/%{_lib}/ruby/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; do
 	sed -i -e '/^#!.*/,1D' $i
 done
 
@@ -447,13 +447,13 @@
 %doc %{name}-%{arcver}/GPL
 %doc %{name}-%{arcver}/LEGAL
 %doc %{name}-%{arcver}/LGPL
-%dir %{_prefix}/lib/ruby
-%dir %{_prefix}/lib/ruby/%{rubyxver}
+%dir %{_prefix}/%{_lib}/ruby
+%dir %{_prefix}/%{_lib}/ruby/%{rubyxver}
 %ifnarch ppc64 s390x sparc64 x86_64
 %if "%{_gnu}" == "-gnueabi"
-%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}-eabi
+%dir %{_prefix}/%{_lib}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}-eabi
 %else
-%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
+%dir %{_prefix}/%{_lib}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 %endif
 %endif
 %ifarch ppc64 s390x sparc64 x86_64
@@ -464,44 +464,44 @@
 %endif
 %{sitedir2}
 ## the following files should goes into ruby-tcltk package.
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/*tk.rb
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/*tk.rb
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/tcltk.rb
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/tk
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/tk*.rb
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/tkextlib
 %exclude %{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
 %exclude %{_libdir}/ruby/%{rubyxver}/*/tkutil.so
 ## the following files should goes into ruby-rdoc package.
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/rdoc
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/rdoc
 ## the following files should goes into ruby-irb package.
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb.rb
-%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/irb.rb
+%exclude %{_prefix}/%{_lib}/ruby/%{rubyxver}/irb
 ## files in ruby-libs from here
-%{_prefix}/lib/ruby/%{rubyxver}/*.rb
-%{_prefix}/lib/ruby/%{rubyxver}/bigdecimal
-%{_prefix}/lib/ruby/%{rubyxver}/cgi
-%{_prefix}/lib/ruby/%{rubyxver}/date
-%{_prefix}/lib/ruby/%{rubyxver}/digest
-%{_prefix}/lib/ruby/%{rubyxver}/dl
-%{_prefix}/lib/ruby/%{rubyxver}/drb
-%{_prefix}/lib/ruby/%{rubyxver}/io
-%{_prefix}/lib/ruby/%{rubyxver}/net
-%{_prefix}/lib/ruby/%{rubyxver}/openssl
-%{_prefix}/lib/ruby/%{rubyxver}/optparse
-%{_prefix}/lib/ruby/%{rubyxver}/racc
-%{_prefix}/lib/ruby/%{rubyxver}/rexml
-%{_prefix}/lib/ruby/%{rubyxver}/rinda
-%{_prefix}/lib/ruby/%{rubyxver}/rss
-%{_prefix}/lib/ruby/%{rubyxver}/runit
-%{_prefix}/lib/ruby/%{rubyxver}/shell
-%{_prefix}/lib/ruby/%{rubyxver}/soap
-%{_prefix}/lib/ruby/%{rubyxver}/test
-%{_prefix}/lib/ruby/%{rubyxver}/uri
-%{_prefix}/lib/ruby/%{rubyxver}/webrick
-%{_prefix}/lib/ruby/%{rubyxver}/wsdl
-%{_prefix}/lib/ruby/%{rubyxver}/xmlrpc
-%{_prefix}/lib/ruby/%{rubyxver}/xsd
-%{_prefix}/lib/ruby/%{rubyxver}/yaml
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/*.rb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/bigdecimal
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/cgi
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/date
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/digest
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/dl
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/drb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/io
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/net
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/openssl
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/optparse
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/racc
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/rexml
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/rinda
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/rss
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/runit
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/shell
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/soap
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/test
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/uri
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/webrick
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/wsdl
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/xmlrpc
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/xsd
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/yaml
 %{_libdir}/libruby.so.*
 %{_libdir}/ruby/%{rubyxver}/*/*.so
 %{_libdir}/ruby/%{rubyxver}/*/digest
@@ -517,11 +517,11 @@
 %doc %{name}-%{arcver}/LEGAL
 %doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/ruby-tcltk/ext/*
-%{_prefix}/lib/ruby/%{rubyxver}/*-tk.rb
-%{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
-%{_prefix}/lib/ruby/%{rubyxver}/tk
-%{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
-%{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/*-tk.rb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/tcltk.rb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/tk
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/tk*.rb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/tkextlib
 %{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
 %{_libdir}/ruby/%{rubyxver}/*/tkutil.so
 
@@ -533,7 +533,7 @@
 %doc %{name}-%{arcver}/LEGAL
 %doc %{name}-%{arcver}/LGPL
 %{_bindir}/rdoc
-%{_prefix}/lib/ruby/%{rubyxver}/rdoc
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/rdoc
 
 %files irb
 %defattr(-, root, root, -)
@@ -544,8 +544,8 @@
 %doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/irb/*
 %{_bindir}/irb
-%{_prefix}/lib/ruby/%{rubyxver}/irb.rb
-%{_prefix}/lib/ruby/%{rubyxver}/irb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/irb.rb
+%{_prefix}/%{_lib}/ruby/%{rubyxver}/irb
 %{_mandir}/man1/irb.1*
  
 %files ri
@@ -580,6 +580,9 @@
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat May 15 2010 Naoya Nakazawa <[email protected]> - 1.8.7-249-1
+- Update to 1.8.7 p 249
+
 * Tue Apr 27 2010 Mamoru Tasaka <[email protected]> - 1.8.6.399-1
 - Update to 1.8.6 p 399 (bug 579675)
 - Patch to fix gc bug causing open4 crash (bug 580993)