vondruch pushed to rubygem-fog-softlayer (master). "Update to fog-softlayer 0.4.1."

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Mar 25 12:53:17 UTC 2015


>From 4471d562c2dbb21e8f1261b5540fd0135870be09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Wed, 25 Mar 2015 13:52:18 +0100
Subject: Update to fog-softlayer 0.4.1.


diff --git a/.gitignore b/.gitignore
index b38c6c7..8a1ace1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /fog-softlayer-0.3.11.gem
 /fog-softlayer-0.3.18.gem
 /fog-softlayer-0.3.26.gem
+/fog-softlayer-0.4.1.gem
diff --git a/rubygem-fog-softlayer-0.4.1-Update-server-model-so-the-build-isnt-broken.patch b/rubygem-fog-softlayer-0.4.1-Update-server-model-so-the-build-isnt-broken.patch
new file mode 100644
index 0000000..6953a55
--- /dev/null
+++ b/rubygem-fog-softlayer-0.4.1-Update-server-model-so-the-build-isnt-broken.patch
@@ -0,0 +1,50 @@
+From c9bfa7698fc2036cb7ca6b3d7775199429076768 Mon Sep 17 00:00:00 2001
+From: Matt Eldridge <matt.eldridge at us.ibm.com>
+Date: Fri, 13 Feb 2015 13:24:28 -0500
+Subject: [PATCH] Update server model so the build isn't broken.
+
+Add TODO to debug that issue.
+---
+ lib/fog/softlayer/models/compute/server.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/fog/softlayer/models/compute/server.rb b/lib/fog/softlayer/models/compute/server.rb
+index 6881795..894463a 100644
+--- a/lib/fog/softlayer/models/compute/server.rb
++++ b/lib/fog/softlayer/models/compute/server.rb
+@@ -259,7 +259,7 @@ def ready?
+         end
+ 
+         def reboot(use_hard_reboot = true)
+-          requires :id
++          # requires :id # TODO: debug why this breaks the tests on bare metal and uncomment this
+           if bare_metal?
+             service.reboot_bare_metal_server(id, use_hard_reboot)
+           else
+@@ -280,7 +280,7 @@ def snapshot
+         end
+ 
+         def start
+-          requires :id
++          # requires :id # TODO: debug why this breaks the tests on bare metal and uncomment this
+           if bare_metal?
+             service.power_on_bare_metal_server(id)
+           else
+@@ -291,7 +291,7 @@ def start
+ 
+         # Hard power off
+         def stop
+-          requires :id
++          # requires :id # TODO: debug why this breaks the tests on bare metal and uncomment this
+           if bare_metal?
+             service.power_off_bare_metal_server(id)
+           else
+@@ -302,7 +302,7 @@ def stop
+ 
+         # Soft power off
+         def shutdown
+-          requires :id
++          # requires :id # TODO: debug why this breaks the tests on bare metal and uncomment this
+           if bare_metal?
+             raise Fog::Errors::Error.new('Shutdown not supported on baremetal servers. Use #stop.')
+           else
diff --git a/rubygem-fog-softlayer.spec b/rubygem-fog-softlayer.spec
index 6b1a505..af7eefa 100644
--- a/rubygem-fog-softlayer.spec
+++ b/rubygem-fog-softlayer.spec
@@ -2,13 +2,16 @@
 %global gem_name fog-softlayer
 
 Name: rubygem-%{gem_name}
-Version: 0.3.26
+Version: 0.4.1
 Release: 1%{?dist}
 Summary: Module for the 'fog' gem to support SoftLayer Cloud
 Group: Development/Languages
 License: MIT
 URL: https://github.com/fog/fog-softlayer
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Workaround test suite errors.
+# https://github.com/fog/fog-softlayer/commit/c9bfa7698fc2036cb7ca6b3d7775199429076768
+patch0: rubygem-fog-softlayer-0.4.1-Update-server-model-so-the-build-isnt-broken.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
@@ -39,6 +42,8 @@ gem unpack %{SOURCE0}
 
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
+%patch0 -p1
+
 %build
 # Create the gem as gem install only works on a gem file
 gem build %{gem_name}.gemspec
@@ -66,7 +71,7 @@ ruby -Ilib -e 'Dir.glob "./spec/**/*_spec.rb", &method(:require)'
 popd
 
 %files
-%doc %{gem_instdir}/LICENSE.txt
+%license %{gem_instdir}/LICENSE.txt
 %dir %{gem_instdir}
 %exclude %{gem_instdir}/.*
 %{gem_libdir}
@@ -89,6 +94,9 @@ popd
 %{gem_instdir}/tests
 
 %changelog
+* Wed Mar 25 2015 Vít Ondruch <vondruch at redhat.com> - 0.4.1-1
+- Update to fog-softlayer 0.4.1.
+
 * Tue Jan 06 2015 Brett Lentz <blentz at redhat.com> - 0.3.26-1
 - New upstream release
 
diff --git a/sources b/sources
index 65de12c..a503c1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61a38420973a74740b12ca4cf42d8202  fog-softlayer-0.3.26.gem
+b079c0ddf6e70dcc7b446d33618a0c5f  fog-softlayer-0.4.1.gem
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rubygem-fog-softlayer.git/commit/?h=master&id=4471d562c2dbb21e8f1261b5540fd0135870be09

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390


More information about the scm-commits mailing list