[rubygem-commander] Updated to Commander 4.0.6. Migrated to RSpec 2.x.

[Vít Ondruch]

commit 34a0e2151960fe4e1b354ce2b9bc7787db45df72
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Nov 18 15:52:29 2011 +0100

    Updated to Commander 4.0.6.
    Migrated to RSpec 2.x.

 .gitignore             |    1 +
 rubygem-commander.spec |   49 +++++++++++++++++++++++++++--------------------
 sources                |    2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c670d7f..3959712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /commander-4.0.3.gem
+/commander-4.0.6.gem
diff --git a/rubygem-commander.spec b/rubygem-commander.spec
index a7c6fc0..3a91177 100644
--- a/rubygem-commander.spec
+++ b/rubygem-commander.spec
@@ -1,23 +1,24 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname commander
+
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 %global rubyabi 1.8
 
 Summary: The complete solution for Ruby command-line executable
 Name: rubygem-%{gemname}
-Version: 4.0.3
-Release: 4%{?dist}
+Version: 4.0.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://visionmedia.github.com/commander
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygems
+Requires: ruby(rubygems)
 Requires: rubygem(highline)
-BuildRequires: rubygems
-# There is echoe dependency in Rakefile, but it's used just for build
-# I bypassed that using 'spec' command which will do same job in check
-BuildRequires: rubygem(rspec)
+BuildRequires: ruby(rubygems)
+# Use rspec-core until rspec are not migrated to RSpec 2.x
+# https://github.com/visionmedia/commander/issues/35
+BuildRequires: rubygem(rspec-core)
 BuildRequires: rubygem(highline)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -34,29 +35,31 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --bindir .%{_bindir} \
+            --force %{SOURCE0}
 
 %build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
-mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gemdir}/bin
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+cp -a .%{gemdir}/* \
+        %{buildroot}%{gemdir}/
+
+mkdir -p %{buildroot}%{_bindir}
+cp -a .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
 
 %check
-pushd %{buildroot}/%{geminstdir}
-%_bindir/spec spec/runner_spec.rb
+pushd .%{geminstdir}
+rspec spec
 popd
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root, -)
 %{_bindir}/commander
 %dir %{geminstdir}
 %{geminstdir}/bin
@@ -64,11 +67,11 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/README.rdoc
 %doc %{geminstdir}/History.rdoc
 %doc %{geminstdir}/Manifest
-%{gemdir}/cache/%{gemname}-%{version}.gem
+%exclude %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
-%defattr(-, root, root, -)
+%{geminstdir}/DEVELOPMENT
 %{geminstdir}/tasks
 %{geminstdir}/spec
 %{geminstdir}/Rakefile
@@ -77,6 +80,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 18 2011 Vít Ondruch <vondruch at redhat.com> - 4.0.6-1
+- Updated to Commander 4.0.6.
+- Migrated to RSpec 2.x.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 2772fa4..d66245f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8402865241bfc1b61118d42b131514d  commander-4.0.3.gem
+7681948b5d6cb87974d844ea20593b9e  commander-4.0.6.gem