From 7b81073cc4781714b85f6b9a1be0f58ddb2675db Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jul 30 2013 14:00:36 +0000
Subject: Update to bundler_ext 0.3.0.


---

diff --git a/rubygem-bundler_ext-0.3.0-fix-spec.patch b/rubygem-bundler_ext-0.3.0-fix-spec.patch
new file mode 100644
index 0000000..f0d9500
--- /dev/null
+++ b/rubygem-bundler_ext-0.3.0-fix-spec.patch
@@ -0,0 +1,24 @@
+From b25bed0459096892192ff89773d9c7cf5da8a662 Mon Sep 17 00:00:00 2001
+From: Lukas Zapletal <lzap+git@redhat.com>
+Date: Thu, 18 Jul 2013 09:17:52 +0200
+Subject: [PATCH] fixing spec - was failing
+
+---
+ spec/bundler_ext/bundler_ext_spec.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/spec/bundler_ext/bundler_ext_spec.rb b/spec/bundler_ext/bundler_ext_spec.rb
+index 07f322b..131f553 100644
+--- a/spec/bundler_ext/bundler_ext_spec.rb
++++ b/spec/bundler_ext/bundler_ext_spec.rb
+@@ -72,6 +72,7 @@
+       it "non-strict mode should load the libraries using env var list" do
+         ENV['BUNDLER_EXT_GROUPS'] = 'test development blah'
+         ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
++        BundlerExt.system_require(@gemfile)
+         defined?(Gem::Command).should be_true
+       end
+     end
+-- 
+1.8.1.6
+
diff --git a/rubygem-bundler_ext.spec b/rubygem-bundler_ext.spec
index 327203a..f663773 100644
--- a/rubygem-bundler_ext.spec
+++ b/rubygem-bundler_ext.spec
@@ -1,8 +1,11 @@
 # Generated from bundler_ext-0.1.0.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name bundler_ext
+
+%if 0%{?fedora:1} && 0%{?fedora} <= 19
 %global rubyabi 1.9.1
+%endif
 
-%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
+%if 0%{?rhel} <= 6
 %global rubyabi 1.8
 %endif
 
@@ -19,16 +22,24 @@
 
 Summary: Load system gems via Bundler DSL
 Name: rubygem-%{gem_name}
-Version: 0.1.0
-Release: 4%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
 Group: Development/Languages
-License: ASL 2.0
+License: MIT
 URL: https://github.com/aeolus-incubator/bundler_ext
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Fix failing test suite.
+# https://github.com/aeolus-incubator/bundler_ext/pull/8
+Patch0: rubygem-bundler_ext-0.3.0-fix-spec.patch
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+Requires: ruby(release)
+BuildRequires: ruby(release)
+%else
 Requires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(abi) = %{rubyabi}
+%endif
 Requires: ruby(rubygems) 
 Requires: rubygem(bundler) 
-BuildRequires: ruby(abi) = %{rubyabi}
 %if 0%{?rhel:1} && 0%{?rhel} <= 6
 BuildRequires: rubygems
 %else
@@ -38,7 +49,7 @@ BuildRequires: ruby
 BuildRequires: rubygem(rspec)
 BuildRequires: rubygem(bundler)
 # This is present to satifys spec/fixtures/Gemfile.in
-BuildRequires: rubygem(deltacloud-client)
+#BuildRequires: rubygem(deltacloud-client)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -59,8 +70,16 @@ Documentation for %{name}
 %prep
 %setup -q -c -T
 mkdir -p .%{gem_dir}
+%if 0%{?rhel} <= 6
 gem install --local --install-dir .%{gem_dir} \
             --force %{SOURCE0}
+%else
+%gem_install -n %{SOURCE0}
+%endif
+
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
 
 %build
 
@@ -69,9 +88,13 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
+# Add executable bit, since the file contains (useless) shebang.
+# https://github.com/aeolus-incubator/bundler_ext/issues/9
+chmod a+x %{buildroot}%{gem_instdir}/Rakefile
+
 %check
 pushd .%{gem_instdir}
-%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
+%if 0%{?rhel:1} && 0%{?rhel} <= 6
 spec spec
 %else
 rspec spec
@@ -82,18 +105,22 @@ popd
 %files
 %dir %{gem_instdir}
 %exclude %{gem_instdir}/.*
-%doc %{gem_instdir}/COPYING
+%doc %{gem_instdir}/MIT-LICENSE
 %{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
 %doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG
 %doc %{gem_instdir}/README.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/spec/
 
 %changelog
+* Thu Jul 18 2013 Vít Ondruch <vondruch@redhat.com> - 0.3.0-1
+- Update to bundler_ext 0.3.0.
+
 * Wed Nov 28 2012 Vít Ondruch <vondruch@redhat.com> - 0.1.0-4
 - Yet again RHEL6 and Fedora 16 compatibility fixes.