[rubygem-boxgrinder-build/f15] Upstream release 0.10.1. Make sure the spec can be used also for Fedora < 17

Marek Goldmann goldmann at fedoraproject.org
Mon Mar 19 13:11:02 UTC 2012 

commit 178828247bdd70d7c68e62a776b1add9d5c67aea
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Mar 19 14:08:33 2012 +0100

    Upstream release 0.10.1. Make sure the spec can be used also for Fedora < 17

 .gitignore                    |    1 +
 rubygem-boxgrinder-build.spec |  110 +++++++++++++++++++++++++----------------
 sources                       |    2 +-
 3 files changed, 70 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60065e5..c5c4d4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /boxgrinder-build-0.9.7.gem
 /boxgrinder-build-0.9.8.gem
 /boxgrinder-build-0.10.0.gem
+/boxgrinder-build-0.10.1.gem
diff --git a/rubygem-boxgrinder-build.spec b/rubygem-boxgrinder-build.spec
index 2fa98e2..a1be0f6 100644
--- a/rubygem-boxgrinder-build.spec
+++ b/rubygem-boxgrinder-build.spec
@@ -1,16 +1,22 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname boxgrinder-build
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name boxgrinder-build
+
+%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
+%{!?gem_instdir: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}}
+
+%if 0%{?fedora} >= 17
+%global rubyabi 1.9.1
+%else
 %global rubyabi 1.8
+%endif
 
-Summary: A tool for creating appliances from simple plain text files
-Name: rubygem-%{gemname}
-Version: 0.10.0
-Release: 2%{?dist}
-Group: Development/Languages
-License: LGPLv3+
-URL: http://boxgrinder.org/
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Summary:     A tool for creating appliances from simple plain text files
+Name:        rubygem-%{gem_name}
+Version:     0.10.1
+Release:     1%{?dist}
+Group:       Development/Languages
+License:     LGPLv3+
+URL:         http://boxgrinder.org/
+Source0:     http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(boxgrinder-core) >= 0.3.9
@@ -19,14 +25,18 @@ Requires: ruby-libguestfs
 
 BuildArch: noarch
 
+BuildRequires: rubygems-devel
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(boxgrinder-core) >= 0.3.9
 BuildRequires: rubygem(boxgrinder-core) < 0.4.0
 BuildRequires: rubygem(echoe)
 BuildRequires: ruby-libguestfs
 
-# Use rspec-core until rspec are migrated to RSpec 2.x
+%if 0%{?fedora} >= 17
+BuildRequires: rubygem(rspec)
+%else
 BuildRequires: rubygem(rspec-core)
+%endif
 
 # AWS
 Requires: euca2ools >= 1.3.1-4
@@ -61,7 +71,7 @@ Requires: rubygem(rest-client)
 
 BuildRequires: rubygem(rest-client)
 
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 Obsoletes: rubygem(boxgrinder-build-ebs-delivery-plugin) < 0.0.4-2
 Obsoletes: rubygem(boxgrinder-build-s3-delivery-plugin) < 0.0.6-1
@@ -98,49 +108,65 @@ Documentation for %{name}
 %build
 
 %install
-rm -rf %{buildroot}
-rm -rf %{_builddir}%{gemdir}
+rm -rf %{_builddir}%{gem_dir}
 
-mkdir -p %{_builddir}%{gemdir}
+mkdir -p %{_builddir}%{gem_dir}
 mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{gemdir}
+mkdir -p %{buildroot}/%{gem_dir}
 
-/usr/bin/gem install --local --install-dir %{_builddir}%{gemdir} \
+/usr/bin/gem install --local --install-dir %{_builddir}%{gem_dir} \
             --force --rdoc %{SOURCE0}
-mv %{_builddir}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-find %{_builddir}%{geminstdir}/bin -type f | xargs chmod a+x
-rm -rf %{_builddir}/%{geminstdir}/integ/packages/*.rpm
-cp -r %{_builddir}%{gemdir}/* %{buildroot}/%{gemdir}
+mv %{_builddir}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
+find %{_builddir}%{gem_instdir}/bin -type f | xargs chmod a+x
+rm -rf %{_builddir}/%{gem_instdir}/integ/packages/*.rpm
+cp -r %{_builddir}%{gem_dir}/* %{buildroot}/%{gem_dir}
+
+install -d -m 755 %{buildroot}/%{_sysconfdir}/bash_completion.d
+mv %{buildroot}/%{gem_instdir}/bash_completion %{buildroot}/%{_sysconfdir}/bash_completion.d/%{name}
+
+chmod +x %{buildroot}/%{gem_instdir}/lib/boxgrinder-build/helpers/qemu.wrapper
 
 %check
-pushd %{_builddir}/%{geminstdir}
-rake spec
+pushd %{_builddir}/%{gem_instdir}
+rspec -I. -P 'spec/**/*-spec.rb'
 popd
 
 %files
-%defattr(-, root, root, -)
 %{_bindir}/boxgrinder-build
-%dir %{geminstdir}
-%{geminstdir}/bin
-%{geminstdir}/lib
-%doc %{geminstdir}/CHANGELOG
-%doc %{geminstdir}/LICENSE
-%doc %{geminstdir}/README.md
-%doc %{geminstdir}/Manifest
-%attr(755, root, root) %{geminstdir}/lib/boxgrinder-build/helpers/qemu.wrapper
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{_sysconfdir}/bash_completion.d/%{name}
+%dir %{gem_instdir}
+%{gem_instdir}/bin
+%{gem_libdir}
+%doc %{gem_instdir}/CHANGELOG
+%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/Manifest
+%{gem_cache}
+%{gem_spec}
 
 %files doc
-%defattr(-, root, root, -)
-%{geminstdir}/spec
-%{geminstdir}/integ
-%{geminstdir}/Rakefile
-%{geminstdir}/rubygem-%{gemname}.spec
-%{geminstdir}/%{gemname}.gemspec
-%{gemdir}/doc/%{gemname}-%{version}
+%{gem_instdir}/spec
+%{gem_instdir}/integ
+%{gem_instdir}/Rakefile
+%{gem_instdir}/rubygem-%{gem_name}.spec
+%{gem_instdir}/%{gem_name}.gemspec
+%{gem_docdir}
 
 %changelog
+* Mon Mar 19 2012 Marek Goldmann <mgoldman at redhat.com> - 0.10.1-1
+- Upstream release 0.10.1
+- Make sure the spec can be used also for Fedora < 17
+- Rebuilt for Ruby 1.9.3, thanks to Bohuslav Kabrda
+- Small cleanup of the spec
+- [BGBUILD-332] Add support for bash completion
+- [BGBUILD-338] Weed out non-deterministic tests
+- [BGBUILD-337] In SL if default repos are disabled, /etc/yum.repos.d folder is not created
+- [BGBUILD-344] New filesystem monitoring improvements (Fixes: Shifting failed. Permission denied issues)
+- [BGBUILD-345] Change sudo/chown magic so it only occurs when running without explicit sudo/su (or --change-to-user)
+- [BGBUILD-346] Confirm Ruby 1.9.3 support
+- [BGBUILD-348] Simplecov coverage testing for Ruby >=1.9
+- [BGBUILD-349] Use RbConfig instead of obsolete and deprecated Config deprecation warning with Ruby 1.9.3
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index d3b4878..ccdf2c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb24fd1d0b302a7e7603c9db827bcf76  boxgrinder-build-0.10.0.gem
+aaf8668dcd530af971e8979a74903080  boxgrinder-build-0.10.1.gem

More information about the scm-commits mailing list