[rubygem-boxgrinder-core/f17] - Upstream release 0.3.11 - Make sure the spec can be used also for Fedora < 17
Marek Goldmann
goldmann at fedoraproject.org
Mon Mar 19 12:19:13 UTC 2012
commit 9e6e8edfd2470792be39af81fcb81d1ca25db5f6
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Mon Mar 19 13:18:43 2012 +0100
- Upstream release 0.3.11
- Make sure the spec can be used also for Fedora < 17
.gitignore | 1 +
rubygem-boxgrinder-core.spec | 39 +++++++++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc90466..410f82e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/boxgrinder-core-0.3.8.gem
/boxgrinder-core-0.3.9.gem
/boxgrinder-core-0.3.10.gem
+/boxgrinder-core-0.3.11.gem
diff --git a/rubygem-boxgrinder-core.spec b/rubygem-boxgrinder-core.spec
index 0e32458..06fc9a0 100644
--- a/rubygem-boxgrinder-core.spec
+++ b/rubygem-boxgrinder-core.spec
@@ -1,14 +1,22 @@
%global gem_name boxgrinder-core
-%global rubyabi 1.9.1
-Summary: Core library for BoxGrinder
-Name: rubygem-%{gem_name}
-Version: 0.3.10
-Release: 3%{?dist}
-Group: Development/Languages
-License: LGPLv3+
-URL: http://boxgrinder.org/
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+%{!?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: Core library for BoxGrinder
+Name: rubygem-%{gem_name}
+Version: 0.3.11
+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(open4)
@@ -20,10 +28,14 @@ BuildRequires: rubygem(open4)
BuildRequires: rubygem(hashery)
BuildRequires: rubygem(echoe)
BuildRequires: rubygem(kwalify)
-# Use rspec-core until rspec are migrated to RSpec 2.x
-BuildRequires: rubygem(rspec-core)
BuildRequires: rubygems-devel
+%if 0%{?fedora} >= 17
+BuildRequires: rubygem(rspec)
+%else
+BuildRequires: rubygem(rspec-core)
+%endif
+
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %{version}
@@ -52,7 +64,10 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
%check
pushd .%{gem_instdir}
+%if 0%{?fedora} >= 17
sed -i "/require 'yaml'/a\ \nYAML::ENGINE.yamler = 'syck'\n" lib/boxgrinder-core/models/config.rb
+%endif
+
rspec spec/**/*-spec.rb
popd
@@ -76,6 +91,10 @@ popd
%{gem_docdir}
%changelog
+* Mon Mar 19 2012 Marek Goldmann <mgoldman at redhat.com> - 0.3.11-1
+- Upstream release 0.3.11
+- Make sure the spec can be used also for Fedora < 17
+
* Thu Feb 02 2012 Vít Ondruch <vondruch at redhat.com> - 0.3.10-3
- Rebuilt for Ruby 1.9.3.
diff --git a/sources b/sources
index d11b414..77f0e5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-329da15684386a0f93a10b77b35f392b boxgrinder-core-0.3.10.gem
+f257c88f36b3d4dc8bb831652329ff60 boxgrinder-core-0.3.11.gem
More information about the scm-commits
mailing list