From d19af9234ce5527e96fa5d0808034b6205a22877 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Aug 08 2016 13:11:34 +0000
Subject: Update to Thin 1.7.0.


---

diff --git a/.gitignore b/.gitignore
index 752b2c4..9d019b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ thin-1.2.5.gem
 /thin-1.6.2.gem
 /thin-1.6.4-tests.tgz
 /thin-1.6.4.gem
+/thin-1.7.0-tests.tgz
+/thin-1.7.0.gem
diff --git a/rubygem-thin-fix-install-spec.patch b/rubygem-thin-fix-install-spec.patch
deleted file mode 100644
index d6e6f52..0000000
--- a/rubygem-thin-fix-install-spec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/spec/controllers/service_spec.rb b/spec/controllers/service_spec.rb
-index 10abdaf..3cff608 100644
---- a/spec/controllers/service_spec.rb
-+++ b/spec/controllers/service_spec.rb
-@@ -28,7 +28,7 @@ describe Service do
-     
-     File.exist?(Service::INITD_PATH).should be_true
-     File.read(Service::INITD_PATH).should include('CONFIG_PATH=tmp/sandbox/etc/thin',
--                                                  'SCRIPT_NAME=tmp/sandbox/etc/init.d/thin',
-+                                                  'SCRIPT_NAME=tmp/sandbox' + (File.directory?('/etc/rc.d') ? '/etc/rc.d/thin' : '/etc/init.d/thin'),
-                                                   'DAEMON=' + Command.script)
-   end
-   
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index cca27fa..44dfcf2 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -1,18 +1,18 @@
 %global gem_name thin
 
 Name: rubygem-%{gem_name}
-Version: 1.6.4
-Release: 3%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 Summary: A thin and fast web server
 Group: Development/Languages
-License: (GPLv2 or Ruby) and MIT
+# lib/thin/stats.html.erb: BSD
+# spec/rails_app/public/javascripts/*.js: MIT
+License: (GPLv2+ or Ruby) and BSD and MIT
 URL: http://code.macournoyer.com/thin/
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/macournoyer/thin.git && cd thing
-# git checkout v1.6.4 && tar czvf thin-1.6.4-tests.tgz spec/
+# git checkout v1.7.0 && tar czvf thin-1.7.0-tests.tgz spec/
 Source1: %{gem_name}-%{version}-tests.tgz
-# https://github.com/macournoyer/thin/issues/76
-Patch3: rubygem-thin-fix-install-spec.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
@@ -21,7 +21,7 @@ BuildRequires: rubygem(rspec2)
 %else
 BuildRequires: rubygem(rspec)
 %endif
-BuildRequires: rubygem(eventmachine) >= 0.12.6
+BuildRequires: rubygem(eventmachine) >= 1.0.4
 BuildRequires: rubygem(daemons) >= 1.0.9
 BuildRequires: rubygem(rack) >= 1.0.0
 
@@ -64,10 +64,12 @@ 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
+# Add executable bit for shebang files
+# https://github.com/macournoyer/thin/pull/320
+pushd %{buildroot}/%{gem_instdir}/example
+chmod 755 async_chat.ru
+chmod 755 async_tailer.ru
+popd
 
 %check
 pushd .%{gem_instdir}
@@ -75,7 +77,8 @@ pushd .%{gem_instdir}
 tar xzvf %{SOURCE1}
 
 # Depends on rubygem-benchmark_unit, not available in Fedora yet.
-rm -rf spec/perf
+find spec/perf -name "*_spec.rb" -exec \
+    sed -i '/be_faster_then/ i \    pending' {} \;
 
 # The 'should force kill process in pid file' spec is not compatible with RSpec2.
 # https://github.com/rspec/rspec-core/issues/520
@@ -85,8 +88,6 @@ sed -i "/'should force kill process in pid file'/a \    pending" spec/daemonizin
 # whole testsuite.
 sed -i '/"tracing routines (with NO custom logger)"/a \    before { pending }' spec/logging_spec.rb
 
-cat %{PATCH3} | patch -p1
-
 %if 0%{?fedora} >= 22
 rspec2 \
 %else
@@ -99,17 +100,9 @@ popd
 %files
 %dir %{gem_instdir}
 %{_bindir}/thin
-%{gem_instdir}/bin
-%dir %{gem_libdir}
-%{gem_libdir}/thin.rb
-%{gem_libdir}/rack/
-%dir %{gem_libdir}/thin/
-%{gem_libdir}/thin/*.rb
-%{gem_libdir}/thin/backends/
-%{gem_libdir}/thin/controllers/
-# BSD
-%{gem_libdir}/thin/stats.html.erb
 %{gem_extdir_mri}
+%{gem_instdir}/bin
+%{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
@@ -121,6 +114,9 @@ popd
 %{gem_instdir}/Rakefile
 
 %changelog
+* Fri Jul 29 2016 Jun Aruga <jaruga@redhat.com> - 1.7.0-1
+- Update to Thin 1.7.0.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 69ec502..3f79620 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b807c2c8e0fa8a0dc8016e06ec7d72c2  thin-1.6.4-tests.tgz
-70a111347b9955ae13faeb388f22fd68  thin-1.6.4.gem
+5adb9199d68a81cb24e320501747cd4e  thin-1.7.0-tests.tgz
+15aa7d84a87160f9e1c0996c6e824b3b  thin-1.7.0.gem