[rubygem-thin] Update to thin 1.6.2.
Vít Ondruch
vondruch at fedoraproject.org
Wed May 21 15:44:49 UTC 2014
commit 087f042c483592e0e383666337fc509038e25f55
Author: Vít Ondruch <vondruch at redhat.com>
Date: Wed May 21 17:44:36 2014 +0200
Update to thin 1.6.2.
.gitignore | 2 +
rubygem-thin-remove-rspec1-require.patch | 10 ---------
rubygem-thin-rspec2-null-object.patch | 31 ----------------------------
rubygem-thin.spec | 33 +++++++++++++++++------------
sources | 4 +-
5 files changed, 23 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 106e4cf..b15139c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ thin-1.2.5.gem
/thin-1.3.1.gem
/thin-1.5.0-tests.tgz
/thin-1.5.0.gem
+/thin-1.6.2-tests.tgz
+/thin-1.6.2.gem
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index 8d2cb3e..0e5bbc0 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -2,18 +2,15 @@
Summary: A thin and fast web server
Name: rubygem-%{gem_name}
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.6.2
+Release: 1%{?dist}
Group: Development/Languages
License: (GPLv2 or Ruby) and MIT
URL: http://code.macournoyer.com/thin/
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone https://github.com/macournoyer/thin.git && cd thin && git checkout v1.5.0
-# tar czvf thin-1.5.0-tests.tgz spec/
+# git clone https://github.com/macournoyer/thin.git && cd thin && git checkout v1.6.2
+# tar czvf thin-1.6.2-tests.tgz spec/
Source1: %{gem_name}-%{version}-tests.tgz
-# 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: curl
@@ -64,6 +61,10 @@ cp -pa .%{_bindir}/* \
find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+# Find files with a shebang that do not have executable permissions
+for file in `find %{buildroot}/%{gem_instdir}/example -type f ! -perm /a+x -name "*.ru"`; do
+ [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
+done
%check
pushd .%{gem_instdir}
@@ -72,16 +73,17 @@ tar xzvf %{SOURCE1}
# 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
+sed -i "/'should force kill process in pid file'/a \ pending" spec/daemonizing_spec.rb
+
+# These 2 tests are passing independently, but fails when running with the
+# whole testsuite.
+sed -i '/"tracing routines (with NO custom logger)"/a \ before { pending }' spec/logging_spec.rb
+
+# https://github.com/macournoyer/thin/issues/232
+sed -i '/"should close body tempfile when closing"/a \ pending' spec/request/processing_spec.rb
-cat %{PATCH1} | patch -p1
-cat %{PATCH2} | patch -p1
cat %{PATCH3} | patch -p1
rspec -I$(dirs +1)%{gem_extdir_mri} spec
@@ -113,6 +115,9 @@ popd
%{gem_instdir}/Rakefile
%changelog
+* Wed May 21 2014 Vít Ondruch <vondruch at redhat.com> - 1.6.2-1
+- Update to thin 1.6.2.
+
* Wed Apr 16 2014 Josef Stribny <jstribny at redhat.com> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
diff --git a/sources b/sources
index 877a602..b4d1c4c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d7ee25c7f947151b93501668c53e2d34 thin-1.5.0-tests.tgz
-2f011aba841da210e49d09b85130dfc0 thin-1.5.0.gem
+975602aca286ad6cbd307ab2883c07ef thin-1.6.2-tests.tgz
+f7c58c6fba07147bb4382115d303a2ac thin-1.6.2.gem
More information about the scm-commits
mailing list