[rubygem-boxgrinder-build/f14] Upstream release 0.9.3. Added patch that fixes one test failing when executed on a system with HW vi

Tue Jun 28 17:58:29 UTC 2011

commit 66c2f9db9a2e11052202ae28f5041bd9d3f4502b
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jun 28 17:57:35 2011 +0200

    Upstream release 0.9.3.
    Added patch that fixes one test failing when executed on a system with HW virt support, removed unnecessary dependencies.

 .gitignore                                 |    1 +
 rubygem-boxgrinder-build-0.9.3-tests.patch |   11 ++
 rubygem-boxgrinder-build.spec              |   60 ++++++--
 sources                                    |    2 +-
 spec_rubygems_require.patch                |  231 ----------------------------
 5 files changed, 58 insertions(+), 247 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a170624..23dc9a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /boxgrinder-build-0.9.0.gem
 /boxgrinder-build-0.9.1.gem
 /boxgrinder-build-0.9.2.gem
+/boxgrinder-build-0.9.3.gem
diff --git a/rubygem-boxgrinder-build-0.9.3-tests.patch b/rubygem-boxgrinder-build-0.9.3-tests.patch
new file mode 100644
index 0000000..93750fa
--- /dev/null
+++ b/rubygem-boxgrinder-build-0.9.3-tests.patch
@@ -0,0 +1,11 @@
+diff -Naur boxgrinder-boxgrinder-build-7ac5151/spec/helpers/guestfs-helper-spec.rb boxgrinder-boxgrinder-build-7ac5151-work/spec/helpers/guestfs-helper-spec.rb
+--- boxgrinder-boxgrinder-build-7ac5151/spec/helpers/guestfs-helper-spec.rb	2011-06-28 19:27:41.000000000 +0200
++++ boxgrinder-boxgrinder-build-7ac5151-work/spec/helpers/guestfs-helper-spec.rb	2011-06-28 18:46:58.000000000 +0200
+@@ -269,6 +269,7 @@
+       it "should return false if we're NOT on EC2 and AMI id retrieval raised an exception" do
+         URI.should_receive(:parse).with('http://169.254.169.254/latest/meta-data/ami-id').and_return('parsed')
+         Net::HTTP.should_receive(:get_response).with("parsed").and_raise "Boom"
++        @helper.should_receive(:`).with("egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l").and_return("0")
+         @helper.hw_virtualization_available?.should == false
+       end
+     end
diff --git a/rubygem-boxgrinder-build.spec b/rubygem-boxgrinder-build.spec
index 7407944..135fd76 100644
--- a/rubygem-boxgrinder-build.spec
+++ b/rubygem-boxgrinder-build.spec
@@ -5,19 +5,18 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.2
-Release: 1%{?dist}
+Version: 0.9.3
+Release: 2%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://boxgrinder.org/
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Patch0: %{name}-%{version}-tests.patch
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(boxgrinder-core) >= 0.3.0
 Requires: rubygem(boxgrinder-core) < 0.4.0
 Requires: ruby-libguestfs
-Requires: parted
-Requires: e2fsprogs
 
 # Fix for rubygem-aws package
 Requires: rubygem(activesupport)
@@ -59,11 +58,6 @@ BuildRequires: rubygem(progressbar)
 Requires: appliance-tools
 Requires: yum-utils
 
-# EC2
-Requires: rsync
-Requires: wget
-Requires: util-linux
-
 # ElasticHosts
 Requires: rubygem(rest-client)
 
@@ -102,6 +96,18 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+rm -rf .%{gemdir}
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force --rdoc %{SOURCE0}
+
+pushd .%{geminstdir}
+rm -rf integ/packages/*.rpm
+
+# Test fix
+%patch0 -p1
+popd
 
 %build
 
@@ -113,14 +119,12 @@ mkdir -p %{_builddir}%{gemdir}
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{gemdir}
 
-/usr/bin/gem install --local --install-dir %{_builddir}%{gemdir} \
-            --force --rdoc %{SOURCE0}
-mv %{_builddir}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-find %{_builddir}%{geminstdir}/bin -type f | xargs chmod a+x
-cp -r %{_builddir}%{gemdir}/* %{buildroot}/%{gemdir}
+mv .%{gemdir}/bin/* %{buildroot}/%{_bindir}
+find %{buildroot}/%{_bindir} -type f | xargs chmod a+x
+cp -r .%{gemdir}/* %{buildroot}/%{gemdir}
 
 %check
-pushd %{_builddir}/%{geminstdir}
+pushd .%{geminstdir}
 rake spec
 popd
 
@@ -141,12 +145,38 @@ popd
 %files doc
 %defattr(-, root, root, -)
 %{geminstdir}/spec
+%{geminstdir}/integ
 %{geminstdir}/Rakefile
 %{geminstdir}/rubygem-%{gemname}.spec
 %{geminstdir}/%{gemname}.gemspec
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Jun 28 2011 Marek Goldmann <mgoldman at redhat.com> - 0.9.3-2
+- Added patch for one test
+- Removed unnecessary dependencies
+
+* Tue Jun 28 2011 Marc Savy <msavy at redhat.com> - 0.9.3-1
+- Upstream release: 0.9.3
+- [BGBUILD-232] boxgrinder doesn't validate config early enough
+- [BGBUILD-237] Tilde characters break creation of yum.conf
+- [BGBUILD-223] BoxGrinder hangs because qemu.wrapper does not detect x86_64 properly on CentOS 5.6
+- [BGBUILD-241] Add Scientific Linux support
+- [BGBUILD-220] Group names have spaces (to the user), this breaks schema rules for packages
+- [BGBUILD-222] Allow overwrite of uploaded ec2 image
+- [BGBUILD-225] Move PAE configuration parameter to operating system configuration
+- [BGBUILD-224] EBS Plugin Support for CentOS v5.5 and fix for non-integer EBS disk sizes
+- [BGBUILD-231] Cannot register Fedora 15 EC2 AMI with S3 delivery plugin in eu-west-1 availability zone
+- [BGBUILD-193] EBS delivery plugin timing/concurrency issues
+- [BGBUILD-247] ap-northeast-1 end-point is missing in S3 plugin (added Tokyo region)
+- [BGBUILD-251] Add ap-northeast-1 (tokyo) region for EBS plugin
+- [BGBUILD-248] Throw error in S3 plugin if invalid region is specified
+- [BGBUILD-252] rc.local script fills ~/.ssh/authorized_keys with a duplicate key every boot
+- [BGBUILD-250] EBS plugin incorrectly determines that non-US regions are not EC2 instances
+- [BGBUILD-254] Not able to deliver EBS AMIs to regions other than us-east-1
+- [BGBUILD-260] Wrong EC2 discovery causing libguestfs errors on non US regions
+- [BGBUILD-261] Decrease amount of debug log when downloading or uploading file using guestfs
+
 * Tue May 17 2011 Marek Goldmann <mgoldman at redhat.com> - 0.9.2-1
 - Upstream release: 0.9.2
 - [BGBUILD-148] Add support for building CentOS/RHEL images on Fedora
diff --git a/sources b/sources
index f78e033..191229f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7bbfe1c695b44518d5bddc3106171bc  boxgrinder-build-0.9.2.gem
+53febdd9843197416b069a987779d6aa  boxgrinder-build-0.9.3.gem
