From 54f5635e07402e251aa02714126c2448e2c48ef4 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Jun 01 2012 13:57:43 +0000 Subject: Update to ActiveResource 3.0.13. --- diff --git a/.gitignore b/.gitignore index f72699c..7f6a4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ activeresource-2.3.5.gem /activeresource-3.0.10.gem /activeresource-3.0.11-tests.tgz /activeresource-3.0.11.gem +/activeresource-3.0.13-tests.tgz +/activeresource-3.0.13.gem diff --git a/activeresource-tests-fix.patch b/activeresource-tests-fix.patch deleted file mode 100644 index b7ed35f..0000000 --- a/activeresource-tests-fix.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- test/abstract_unit.rb.orig 2011-01-11 00:58:23.280505705 -0500 -+++ test/abstract_unit.rb 2011-01-11 00:58:30.357505970 -0500 -@@ -1,4 +1,4 @@ --require File.expand_path('../../../load_paths', __FILE__) -+require 'rubygems' - - lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") - $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) diff --git a/rubygem-activeresource.spec b/rubygem-activeresource.spec index 85e236c..3eb8413 100644 --- a/rubygem-activeresource.spec +++ b/rubygem-activeresource.spec @@ -6,7 +6,7 @@ Summary: Active Record for web resources Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.0.11 +Version: 3.0.13 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -21,18 +21,14 @@ Source1: http://github.com/rails/rails/raw/v%{version}/%{gem_name}/Rakefile # You may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activeresource/ -# git checkout v3.0.11 -# tar czvf activeresource-3.0.11-tests.tgz test/ +# git checkout v3.0.13 +# tar czvf activeresource-3.0.13-tests.tgz test/ Source2: activeresource-%{version}-tests.tgz # Remove a task which breaks the Rakefile due to the gemspec # not being present in the gem Patch0: activeresource-rakefile-fix.patch -# Removes code which breaks the test suite due to a -# dependency on a file in the greater rails proj -Patch1: activeresource-tests-fix.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: rubygem(activesupport) = %{version} @@ -66,7 +62,6 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir} pushd ./%{gem_instdir} %patch0 -p0 -%patch1 -p0 popd %build @@ -96,11 +91,14 @@ rm -rf %{buildroot} %check pushd %{buildroot}%{gem_instdir} + +# load_path is not available, remove its require. +sed -i '1,+1d' test/abstract_unit.rb + rake test --trace popd %files -%defattr(-, root, root, -) %dir %{gem_instdir} %doc %{gem_instdir}/CHANGELOG %doc %{gem_instdir}/examples @@ -109,11 +107,14 @@ popd %{gem_instdir}/Rakefile %{gem_instdir}/test %doc %{gem_docdir} -%{gem_cache} +%exclude %{gem_cache} %{gem_spec} %changelog +* Fri Jun 01 2012 Vít Ondruch - 1:3.0.13-1 +- Update to ActiveResource 3.0.13. + * Wed Jan 25 2012 Bohuslav Kabrda - 1:3.0.11-1 - Rebuilt for Ruby 1.9.3. - Update to ActiveResource 3.0.11 diff --git a/sources b/sources index d5d0fa9..9a82fff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9227ce3a0be37a387fd62e418eaf6bf2 activeresource-3.0.11-tests.tgz -b6f5d678376dcea42c32da0b2d83e97f activeresource-3.0.11.gem +6c5046f3cd22a26425c42941029f58ab activeresource-3.0.13-tests.tgz +5d9a0e78c71e025d0b288f356bb973bd activeresource-3.0.13.gem