rpms/ruby-hpricot/devel hpricot-0.6-win.patch, NONE, 1.1 ruby-hpricot.spec, 1.4, 1.5

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Dec 20 07:02:51 UTC 2008


Author: mtasaka

Update of /cvs/extras/rpms/ruby-hpricot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23317

Modified Files:
	ruby-hpricot.spec 
Added Files:
	hpricot-0.6-win.patch 
Log Message:
* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-3
- Fix build error related to Windows constant, detected
  by Matt's mass build
  (possibly due to rubygems 1.3.1 change)


hpricot-0.6-win.patch:

--- NEW FILE hpricot-0.6-win.patch ---
--- hpricot-0.6/Rakefile.win	2008-12-20 15:53:09.000000000 +0900
+++ hpricot-0.6/Rakefile	2008-12-20 15:56:51.000000000 +0900
@@ -142,7 +142,7 @@
 ### Win32 Packages ###
 
 Win32Spec = SPEC.dup
-Win32Spec.platform = Gem::Platform::WIN32
+Win32Spec.platform = Gem::Platform::WIN32 rescue nil
 Win32Spec.files = PKG_FILES + ["#{ARCHLIB}/hpricot_scan.so"]
 Win32Spec.extensions = []
   


Index: ruby-hpricot.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-hpricot/devel/ruby-hpricot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ruby-hpricot.spec	12 Feb 2008 15:43:10 -0000	1.4
+++ ruby-hpricot.spec	20 Dec 2008 07:02:21 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:		ruby-%{modname}
 Version:	0.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Group:		Development/Languages
 
@@ -14,6 +14,7 @@
 URL:		http://code.whytheluckystiff.net/hpricot/
 Source0:	http://code.whytheluckystiff.net/dist/%{modname}-%{version}.tgz
 Patch0:		hpricot-0.6-skip-ragel-step-bz432186.patch
+Patch1:		hpricot-0.6-win.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ragel
@@ -31,6 +32,7 @@
 %prep
 %setup -q -n %{modname}-%{version}
 %patch0 -p0 -b .ragel6
+%patch1 -p1 -b .win
 
 %build
 # To make debuginfo work correctly...
@@ -71,6 +73,11 @@
 %{ruby_sitelib}/%{modname}/
 
 %changelog
+* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-3
+- Fix build error related to Windows constant, detected
+  by Matt's mass build
+  (possibly due to rubygems 1.3.1 change)
+
 * 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+




More information about the fedora-extras-commits mailing list