[rubygem-thin/f14] Make F-14 use the same parser path patch as rawhide
Chris Lalancette
clalance at fedoraproject.org
Thu Aug 18 15:09:09 UTC 2011
commit ec75ac0a112dd4818931199dfde8c1397ec7370a
Author: Chris Lalancette <clalance at redhat.com>
Date: Thu Aug 18 10:26:29 2011 -0400
Make F-14 use the same parser path patch as rawhide
Signed-off-by: Chris Lalancette <clalance at redhat.com>
rubygem-thin-fix-parser-load-path.patch | 11 +++++++++++
rubygem-thin.spec | 13 ++++++++-----
sources | 1 -
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/rubygem-thin-fix-parser-load-path.patch b/rubygem-thin-fix-parser-load-path.patch
new file mode 100644
index 0000000..22ed033
--- /dev/null
+++ b/rubygem-thin-fix-parser-load-path.patch
@@ -0,0 +1,11 @@
+--- lib/thin.rb.orig 2011-07-22 13:25:23.734862201 -0400
++++ lib/thin.rb 2011-07-22 13:25:48.477055427 -0400
+@@ -44,7 +44,7 @@ if Thin.win?
+ major_ruby_version = RUBY_VERSION[/^(\d+\.\d+)/]
+ require "#{Thin::ROOT}/#{major_ruby_version}/thin_parser"
+ else
+- require "#{Thin::ROOT}/thin_parser"
++ require 'thin_parser'
+ end
+
+ module Rack
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index 99ee8bf..e9eb940 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -8,12 +8,12 @@
Summary: A thin and fast web server
Name: rubygem-%{gemname}
Version: 1.2.11
-Release: 8%{?dist}
+Release: 9%{?dist}
Group: Development/Languages
License: (GPLv2 or Ruby) and BSD and MIT
URL: http://code.macournoyer.com/thin/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: native-load-path-1.2.11.patch
+Patch1: rubygem-thin-fix-parser-load-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
@@ -58,8 +58,8 @@ gem install \
--install-dir ./%{gemdir} \
-V --force \
%{SOURCE0}
-pushd ./%{geminstdir}/lib
-%patch0
+pushd ./%{geminstdir}
+%patch1
popd
%build
@@ -154,7 +154,10 @@ rm -rf %{buildroot}
%{geminstdir}/lib/thin/stats.html.erb
%changelog
-* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-7
+* Thu Aug 18 2011 Chris Lalancette <clalance at redhat.com> - 1.2.11-9
+- Make F-14 use the same parser path patch as rawhide
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-8
- Updated to patch for version 1.2.11
* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-7
diff --git a/sources b/sources
index 70665e5..f3c8b2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
9040330417adda974c07006762b537f2 thin-1.2.11.gem
-ef41f462c1833c80c6da898248554ce5 native-load-path-1.2.11.patch
More information about the scm-commits
mailing list