[rubygem-mixlib-shellout] Update to 1.3.0 (bz#1038148)

Julian C. Dunn jdunn at fedoraproject.org
Wed Dec 4 17:20:58 UTC 2013


commit b890c573bec295adabeb8a4b7a2ad812233f4474
Author: Julian C. Dunn <jdunn at aquezada.com>
Date:   Wed Dec 4 12:20:33 2013 -0500

    Update to 1.3.0 (bz#1038148)

 .gitignore                                 |    2 ++
 mixlib-shellout-awesomeprint-removal.patch |   27 ---------------------------
 mixlib-shellout-usrmove.patch              |    4 ++--
 rubygem-mixlib-shellout.spec               |   10 +++++-----
 sources                                    |    4 ++--
 5 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e3f53b..615ddb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /rubygem-mixlib-shellout-1.1.0-specs.tgz
 /mixlib-shellout-1.2.0.gem
 /rubygem-mixlib-shellout-1.2.0-specs.tgz
+/mixlib-shellout-1.3.0.gem
+/rubygem-mixlib-shellout-1.3.0-specs.tgz
diff --git a/mixlib-shellout-usrmove.patch b/mixlib-shellout-usrmove.patch
index dccebc5..59e23b2 100644
--- a/mixlib-shellout-usrmove.patch
+++ b/mixlib-shellout-usrmove.patch
@@ -1,5 +1,5 @@
 diff --git a/spec/mixlib/shellout_spec.rb b/spec/mixlib/shellout_spec.rb
-index cc59829..cecd585 100644
+index 68225c6..150aa71 100644
 --- a/spec/mixlib/shellout_spec.rb
 +++ b/spec/mixlib/shellout_spec.rb
 @@ -298,7 +298,7 @@ describe Mixlib::ShellOut do
@@ -7,7 +7,7 @@ index cc59829..cecd585 100644
  
        context 'when running under Unix', :unix_only do
 -        let(:cwd) { '/bin' }
-+        let(:cwd) { '/tmp' }
++        let(:cwd) { File.symlink?('/bin') ? '/tmp' : '/bin' }
          let(:cmd) { 'pwd' }
  
          it "should chdir to the working directory" do
diff --git a/rubygem-mixlib-shellout.spec b/rubygem-mixlib-shellout.spec
index e92178e..c6d5b92 100644
--- a/rubygem-mixlib-shellout.spec
+++ b/rubygem-mixlib-shellout.spec
@@ -18,12 +18,12 @@
 
 Summary: Run external commands on Unix or Windows
 Name: rubygem-%{gem_name}
-Version: 1.2.0
+Version: 1.3.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0
 URL: https://github.com/opscode/mixlib-shellout
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Tests for this package are not in the gem. To update:
 # git clone https://github.com/opscode/mixlib-shellout.git && cd mixlib-shellout
 # git checkout 1.2.0
@@ -31,8 +31,6 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Source1: rubygem-%{gem_name}-%{version}-specs.tgz
 # Patch for UsrMove, see http://tickets.opscode.com/browse/MIXLIB-6
 Patch0: mixlib-shellout-usrmove.patch
-# Patch for removal of awesomeprint, see http://tickets.opscode.com/browse/MIXLIB-7
-Patch1: mixlib-shellout-awesomeprint-removal.patch
 
 %if 0%{?fedora} >= 19
 Requires: ruby(release)
@@ -83,7 +81,6 @@ cp -a .%{gem_dir}/* \
 pushd .%{gem_instdir}
 tar zxvf %{SOURCE1}
 patch -p1 < %{PATCH0}
-patch -p1 < %{PATCH1}
 # One of the tests involves a fork && sleep 10 that may not finish before mock
 rspec && sleep 10
 popd
@@ -100,6 +97,9 @@ popd
 %doc %{gem_docdir}
 
 %changelog
+* Wed Dec 04 2013 Julian C. Dunn <jdunn at aquezada.com> - 1.3.0-1
+- Upgrade to 1.3.0 (bz#1038148)
+
 * Sun Sep 01 2013 Julian C. Dunn <jdunn at aquezada.com> - 1.2.0-1
 - Upgrade to 1.2.0
 
diff --git a/sources b/sources
index d974452..9ba6a22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cdf0d949c286bd5bc1de607088e512a8  mixlib-shellout-1.2.0.gem
-5daff737592eead9a2b80b353079aded  rubygem-mixlib-shellout-1.2.0-specs.tgz
+7574f6f165d0145977d6ae7367453833  mixlib-shellout-1.3.0.gem
+553a5365d6ce4f31b48f820b4a2863fa  rubygem-mixlib-shellout-1.3.0-specs.tgz


More information about the scm-commits mailing list