From 2f09b51d7580d8138d20fcd62b19920d4f3ce157 Mon Sep 17 00:00:00 2001
From: Josef Stribny <jstribny@redhat.com>
Date: Thu, 25 Jul 2013 10:34:13 +0200
Subject: [PATCH] Update to thor 0.18.1

---
 .gitignore        |  1 +
 rubygem-thor.spec | 30 ++++++++++++++++++------------
 sources           |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ca4585..9f39485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ thor-0.13.6.gem
 /thor-0.14.6.gem
 /thor-0.16.0.gem
 /thor-0.17.0.gem
+/thor-0.18.1.gem
diff --git a/rubygem-thor.spec b/rubygem-thor.spec
index 83f8d9e..2defaea 100644
--- a/rubygem-thor.spec
+++ b/rubygem-thor.spec
@@ -6,7 +6,7 @@
 
 Summary: Scripting framework that replaces rake, sake and rubigen
 Name: rubygem-%{gem_name}
-Version: 0.17.0
+Version: 0.18.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -65,11 +65,17 @@ pushd .%{gem_instdir}
 sed -i "s/require 'bundler'//" Thorfile
 
 # kill simplecov dependency
-sed -i '3,7d' spec/spec_helper.rb
+sed -i '3,10d' spec/helper.rb
 
 # This fixes on test failure due to encoding issues.
 # https://github.com/wycats/thor/issues/278
-sed -i '178 i\content.force_encoding "UTF-8"' spec/shell/basic_spec.rb
+sed -i '177 i\content.force_encoding "UTF-8"' spec/shell/basic_spec.rb
+
+# Fix failing tests
+# /components and .empty_directory are present in git under v0.18.1 tag,
+# but missing in .gem so the tests are failing
+mkdir spec/fixtures/doc/components
+touch spec/fixtures/doc/components/.empty_directory
 
 rspec spec
 popd
@@ -77,26 +83,26 @@ popd
 
 %files
 %{_bindir}/thor
-%{_bindir}/rake2thor
-%dir %{gem_instdir}
-%doc %{gem_instdir}/CHANGELOG.rdoc
 %doc %{gem_instdir}/LICENSE.md
-%doc %{gem_instdir}/README.md
-%exclude %{gem_instdir}/.*
+%dir %{gem_instdir}
 %{gem_instdir}/bin
 %{gem_libdir}
+%exclude %{gem_instdir}/.*
 %exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
-%{gem_instdir}/Gemfile
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/README.md
 %{gem_instdir}/Thorfile
+%{gem_instdir}/spec
 %{gem_instdir}/thor.gemspec
-%{gem_instdir}/spec/
-%exclude %{gem_instdir}/spec/fixtures/doc/components/.empty_directory
-%doc %{gem_docdir}
 
 %changelog
+* Thu Jul 25 2013 Josef Stribny <jstribny@redhat.com> - 0.18.1-1
+- Update to Thor 0.18.1.
+
 * Mon Mar 04 2013 Josef Stribny <jstribny@redhat.com> - 0.17.0-1
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
 - Update to Thor 0.17.0
diff --git a/sources b/sources
index 16a7f97..8c2fa1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e514e3d2fd771942898dd2725384ac0  thor-0.17.0.gem
+a1be884a982166054d1ac35c4a9bef55  thor-0.18.1.gem