[rubygem-arel] Update to Arel 3.0.2.

Vít Ondruch vondruch at fedoraproject.org
Wed Jul 18 14:08:33 UTC 2012


commit f009908a6f9da90450dfc7ec1036145961138b79
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Jul 18 16:07:35 2012 +0200

    Update to Arel 3.0.2.

 .gitignore                                 |    1 +
 arel-2.0.9-add-bigdecimal-dependency.patch |   16 -----------
 arel-3.0.2-add-bigdecimal-dependency.patch |   20 +++++++++++++
 disable-failing-test.patch                 |   17 -----------
 rubygem-arel.spec                          |   41 +++++++++++++--------------
 sources                                    |    2 +-
 6 files changed, 42 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d829eca..7cca198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /arel-2.0.7.gem
 /arel-2.0.9.gem
+/arel-3.0.2.gem
diff --git a/arel-3.0.2-add-bigdecimal-dependency.patch b/arel-3.0.2-add-bigdecimal-dependency.patch
new file mode 100644
index 0000000..d73622f
--- /dev/null
+++ b/arel-3.0.2-add-bigdecimal-dependency.patch
@@ -0,0 +1,20 @@
+--- a/specifications/arel-3.0.2.gemspec
++++ b/specifications/arel-3.0.2.gemspec
+@@ -25,14 +25,17 @@
+       s.add_development_dependency(%q<minitest>, ["~> 2.11"])
+       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+       s.add_development_dependency(%q<hoe>, ["~> 2.13"])
++      s.add_dependency(%q<bigdecimal>, [])
+     else
+       s.add_dependency(%q<minitest>, ["~> 2.11"])
+       s.add_dependency(%q<rdoc>, ["~> 3.10"])
+       s.add_dependency(%q<hoe>, ["~> 2.13"])
++      s.add_dependency(%q<bigdecimal>, [])
+     end
+   else
+     s.add_dependency(%q<minitest>, ["~> 2.11"])
+     s.add_dependency(%q<rdoc>, ["~> 3.10"])
+     s.add_dependency(%q<hoe>, ["~> 2.13"])
++    s.add_dependency(%q<bigdecimal>, [])
+   end
+ end
diff --git a/rubygem-arel.spec b/rubygem-arel.spec
index 3ff4b4a..a8b9f0d 100644
--- a/rubygem-arel.spec
+++ b/rubygem-arel.spec
@@ -1,23 +1,24 @@
 %global gem_name arel
+%global rubyabi 1.9.1
 
 Summary: Arel is a Relational Algebra for Ruby
 Name: rubygem-%{gem_name}
-Version: 2.0.9
-Release: 4%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/rails/%{gem_name}
 
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Fix for test failure. This fix is relevant only for 2.0.x release.
-# https://github.com/rails/arel/commit/a1662156b3abb8830f7245bd6e398cf2ca1291d4
-Patch0: disable-failing-test.patch
 # https://github.com/rails/arel/issues/107
-Patch1: arel-2.0.9-add-bigdecimal-dependency.patch
-Requires: ruby(abi) = 1.9.1
+Patch0: arel-%{version}-add-bigdecimal-dependency.patch
+Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: rubygem(bigdecimal)
+BuildRequires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems-devel
+BuildRequires: ruby
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(bigdecimal)
 BuildArch: noarch
@@ -45,47 +46,45 @@ mkdir -p .%{gem_dir}
 gem install --local --install-dir .%{gem_dir} \
             --force --rdoc %{SOURCE0}
 
-pushd .%{gem_instdir}
-%patch0
-popd
-
 pushd .%{gem_dir}
-%patch1 -p1
+%patch0 -p1
 popd
 
+%build
+
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-rm %{buildroot}/%{gem_instdir}/.autotest
-rm %{buildroot}/%{gem_instdir}/.gemtest
-
 %check
-pushd %{buildroot}/%{gem_instdir}/test
-ruby -I../lib -I. -e "Dir.glob('./**/test_*').each {|t| require t}"
+pushd .%{gem_instdir}
+testrb -Ilib:test test
 popd
 
 %files
-%defattr(-, root, root, -)
 %dir %{gem_instdir}
+%exclude %{gem_instdir}/.*
 %{gem_libdir}
-%doc %{gem_instdir}/History.txt
 %doc %{gem_instdir}/MIT-LICENSE.txt
-%doc %{gem_instdir}/README.markdown
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
-%defattr(-, root, root, -)
 %{gem_instdir}/test
 %{gem_instdir}/arel.gemspec
+%{gem_instdir}/Gemfile
+%doc %{gem_instdir}/History.txt
 %doc %{gem_instdir}/Manifest.txt
+%doc %{gem_instdir}/README.markdown
 %{gem_instdir}/Rakefile
 %doc %{gem_docdir}
 
 
 %changelog
+* Wed Jul 18 2012 Vít Ondruch <vondruch at redhat.com> - 3.0.2-1
+- Update to Arel 3.0.2.
+
 * Fri Mar 09 2012 Vít Ondruch <vondruch at redhat.com> - 2.0.9-4
 - Fix dependency on BigDecimal.
 
diff --git a/sources b/sources
index d647194..83702ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6a4c6749efe476ebb71b95354814dfb  arel-2.0.9.gem
+7436bc52ddb27274c939147d563835ce  arel-3.0.2.gem


More information about the scm-commits mailing list