From 7c85dd7b99bac2ba9524770c5c25f7d6953dc735 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Jul 22 2011 17:41:38 +0000 Subject: Fix the thin_parser load path. Signed-off-by: Chris Lalancette --- 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 77cd935..4e3d2c6 100644 --- a/rubygem-thin.spec +++ b/rubygem-thin.spec @@ -8,11 +8,12 @@ Summary: A thin and fast web server Name: rubygem-%{gemname} Version: 1.2.11 -Release: 1%{?dist} +Release: 2%{?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 +Patch1: rubygem-thin-fix-parser-load-path.patch Requires: ruby(abi) = %{rubyabi} Requires: rubygems Requires: rubygem(rack) >= 1.0.0 @@ -53,6 +54,9 @@ mkdir -p ./%{gemdir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install --local --install-dir ./%{gemdir} -V --force %{SOURCE0} +pushd .%{geminstdir} +%patch1 + %build %install @@ -79,7 +83,7 @@ exit 0 %endif pushd ./%{geminstdir} SPECS= -RUBYOPT="rubygems I%{buildroot}%{geminstdir}/lib Ispec Ibenchmark_unit" spec -b `echo " +RUBYOPT="rubygems I%{buildroot}%{geminstdir}/lib I%{buildroot}%{ruby_sitearch} Ispec Ibenchmark_unit" spec -b `echo " PERF_SPECS = Dir['spec/perf/*_spec.rb'] + [ 'spec/server/pipelining_spec.rb' ] WIN_SPECS = %w( spec/backends/unix_server_spec.rb @@ -136,6 +140,9 @@ popd %{geminstdir}/lib/thin/stats.html.erb %changelog +* Fri Jul 22 2011 Chris Lalancette - 1.2.11-2 +- Fix the load path for thin_parser + * Tue Mar 01 2011 Michal Fojtik - 1.2.11-1 - Version bump