[rubygem-thin] Update to Thin 1.3.1.
Vít Ondruch
vondruch at fedoraproject.org
Mon Dec 5 12:32:09 UTC 2011
commit d15c6828791bdf8dab7374a6f1af4796ad0936ed
Author: Vít Ondruch <vondruch at redhat.com>
Date: Mon Dec 5 13:31:44 2011 +0100
Update to Thin 1.3.1.
rubygem-thin.spec | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index 778788f..b3db578 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -7,13 +7,18 @@
Summary: A thin and fast web server
Name: rubygem-%{gemname}
-Version: 1.2.11
-Release: 10%{?dist}
+Version: 1.3.1
+Release: 1%{?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
+Patch0: rubygem-thin-fix-parser-load-path.patch
+# https://github.com/macournoyer/thin/issues/77
+Patch1: rubygem-thin-remove-rspec1-require.patch
+Patch2: rubygem-thin-rspec2-null-object.patch
+# https://github.com/macournoyer/thin/issues/76
+Patch3: rubygem-thin-fix-install-spec.patch
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
Requires: rubygem(rack) >= 1.0.0
@@ -26,7 +31,6 @@ BuildRequires: ruby(rubygems)
BuildRequires: curl
BuildRequires: libcurl-devel
BuildRequires: rubygem(rake-compiler)
-BuildRequires: rubygem(rspec)
BuildRequires: rubygem(rspec-core)
BuildRequires: rubygem(eventmachine) >= 0.12.6
BuildRequires: rubygem(daemons) >= 1.0.9
@@ -55,7 +59,10 @@ export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install --local --install-dir ./%{gemdir} -V --force %{SOURCE0}
pushd .%{geminstdir}
-%patch1
+%patch0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
@@ -81,20 +88,20 @@ rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
%ifarch ppc64
exit 0
%endif
-pushd ./%{geminstdir}
-SPECS=
-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
-spec/controllers/service_spec.rb
-spec/daemonizing_spec.rb
-spec/server/unix_socket_spec.rb
-spec/server/swiftiply_spec.rb
-)
-SPECS2 = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)
-puts Dir['spec/**/*_spec.rb'] - PERF_SPECS - WIN_SPECS - SPECS2
-" | ruby`
+pushd .%{geminstdir}
+
+# Depends on rubygem-benchmark_unit, not available in Fedora yet.
+rm -rf spec/perf
+# Test fails.
+# https://github.com/macournoyer/thin/issues/40
+rm spec/server/pipelining_spec.rb
+# The 'should force kill process in pid file' spec is not compatible with RSpec2.
+# https://github.com/rspec/rspec-core/issues/520
+# http://rubyforge.org/tracker/?func=detail&aid=29450&group_id=524&atid=2086
+ruby -ne "print unless (99..117).include? $." spec/daemonizing_spec.rb > spec/daemonizing_spec.rb
+
+rspec spec
+
popd
%files
@@ -136,10 +143,12 @@ popd
%{geminstdir}/spec/rails_app/config/
%{geminstdir}/spec/rails_app/script/
# MIT
-%doc %{geminstdir}/COPYING
%{geminstdir}/spec/rails_app/public/
%changelog
+* Fri Nov 25 2011 Vít Ondruch <vondruch at redhat.com> - 1.3.1-1
+- Update to Thin 1.3.1.
+
* Tue Sep 06 2011 Chris Lalancette <clalance at redhat.com> - 1.2.11-10
- Bump the release so upgrades from F-16 work
More information about the scm-commits
mailing list