rpms/ruby-hpricot/devel hpricot-0.6-skip-ragel-step-bz432186.patch, NONE, 1.1 ruby-hpricot.spec, 1.2, 1.3

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-hpricot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24169

Modified Files:
	ruby-hpricot.spec 
Added Files:
	hpricot-0.6-skip-ragel-step-bz432186.patch 
Log Message:
* Wed Feb 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-2
- Rebuild against gcc43
- Patch for Rakefile to skip unneeded commands call for ragel 6.0+
  (bug 432186, Thanks Jeremy Hinegardner !!)


hpricot-0.6-skip-ragel-step-bz432186.patch:

--- NEW FILE hpricot-0.6-skip-ragel-step-bz432186.patch ---
--- Rakefile.orig	2007-06-15 16:28:48.000000000 -0600
+++ Rakefile	2008-02-10 17:34:22.000000000 -0700
@@ -109,20 +109,35 @@
   cp ext_so, ARCHLIB
 end
 
+### Extension Building ###
 desc "returns the ragel version"
 task :ragel_version do
   @ragel_v = `ragel -v`[/(version )(\S*)/,2].to_f
 end
 
+RAGEL_COMMON  = "ext/hpricot_scan/hpricot_common.rl"
+RAGEL_C_FILES = [ RAGEL_COMMON, "ext/hpricot_scan/hpricot_scan.rl" ]
+RAGEL_J_FILES = [ RAGEL_COMMON, "ext/hpricot_scan/hpricot_scan.java.rl" ]
+C_OUTPUT      = "ext/hpricot_scan/hpricot_scan.c"
+JAVA_OUTPUT   = "ext/hpricot_scan/HpricotScanService.java"
+
+file C_OUTPUT => RAGEL_C_FILES do |t|
+  cmd = "ragel #{@ragel_v >= 6.0 ? "-G2 -o #{t.name}" : '' } #{RAGEL_C_FILES.last}"
+  cmd += %{ | #{@ragel_v >= 5.18 ? 'rlgen-cd' : 'rlcodegen'} -G2 -o #{t.name}} if @ragel_v < 6.0
+  sh cmd
+end
+
 desc "Generates the C scanner code with Ragel."
-task :ragel => [:ragel_version] do
-  sh %{ragel ext/hpricot_scan/hpricot_scan.rl | #{@ragel_v >= 5.18 ? 'rlgen-cd' : 'rlcodegen'} -G2 -o ext/hpricot_scan/hpricot_scan.c}
+task :ragel => [:ragel_version, C_OUTPUT] 
+
+file JAVA_OUTPUT => RAGEL_J_FILES do |t|
+  cmd = "ragel -J #{@ragel_v >= 6.0 ? "-o #{t.name}" : '' } #{RAGEL_J_FILES.last}"
+  cmd += %{ | #{@ragel_v >= 5.18 ? 'rlgen-java' : 'rlcodegen'} -o #{t.name}} if @ragel_v < 6.0
+  sh cmd
 end
 
 desc "Generates the Java scanner code with Ragel."
-task :ragel_java => [:ragel_version] do
-  sh %{ragel -J ext/hpricot_scan/hpricot_scan.java.rl | #{@ragel_v >= 5.18 ? 'rlgen-java' : 'rlcodegen'} -o  ext/hpricot_scan/HpricotScanService.java}
-end
+task :ragel_java => [:ragel_version, JAVA_OUTPUT] 
 
 ### Win32 Packages ###
 


Index: ruby-hpricot.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-hpricot/devel/ruby-hpricot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-hpricot.spec	9 Feb 2008 04:22:05 -0000	1.2
+++ ruby-hpricot.spec	12 Feb 2008 15:40:25 -0000	1.3
@@ -6,13 +6,14 @@
 
 Name:		ruby-%{modname}
 Version:	0.6
-Release:	1%{?dist}.2
+Release:	1.1%{?dist}
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://code.whytheluckystiff.net/hpricot/
 Source0:	http://code.whytheluckystiff.net/dist/%{modname}-%{version}.tgz
+Patch0:		hpricot-0.6-skip-ragel-step-bz432186.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ragel
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q -n %{modname}-%{version}
+%patch0 -p0 -b .ragel6
 
 %build
 # To make debuginfo work correctly...
@@ -69,8 +71,10 @@
 %{ruby_sitelib}/%{modname}/
 
 %changelog
-* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Wed Feb 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-2
 - Rebuild against gcc43
+- Patch for Rakefile to skip unneeded commands call for ragel 6.0+
+  (bug 432186, Thanks Jeremy Hinegardner !!)
 
 * Tue Nov  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-1
 - 0.6