[rubygem-actionmailer] Update to ActionMailer 3.0.13.
Vít Ondruch
vondruch at fedoraproject.org
Fri Jun 1 14:01:43 UTC 2012
commit ce53b1143416bd1a63f4bb06ac02879c88d304a4
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Jun 1 15:57:09 2012 +0200
Update to ActionMailer 3.0.13.
.gitignore | 2 ++
actionmailer-tests-fix.patch | 11 -----------
actionmailer-update-mail-dep.patch | 10 +++++-----
rubygem-actionmailer.spec | 23 ++++++++++++-----------
sources | 4 ++--
5 files changed, 21 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c808e45..cf08375 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ actionmailer-2.3.5.gem
/actionmailer-3.0.10.gem
/actionmailer-3.0.11-tests.tgz
/actionmailer-3.0.11.gem
+/actionmailer-3.0.13-tests.tgz
+/actionmailer-3.0.13.gem
diff --git a/actionmailer-update-mail-dep.patch b/actionmailer-update-mail-dep.patch
index 8c161a0..630f61a 100644
--- a/actionmailer-update-mail-dep.patch
+++ b/actionmailer-update-mail-dep.patch
@@ -1,18 +1,18 @@
---- specifications/actionmailer-3.0.11.gemspec.orig 2011-06-02 18:25:45.915446995 -0400
-+++ specifications/actionmailer-3.0.11.gemspec 2011-06-02 18:26:14.600445963 -0400
+--- specifications/actionmailer-3.0.13.gemspec.orig 2011-06-02 18:25:45.915446995 -0400
++++ specifications/actionmailer-3.0.13.gemspec 2011-06-02 18:26:14.600445963 -0400
@@ -22,13 +22,13 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<actionpack>, ["= 3.0.11"])
+ s.add_runtime_dependency(%q<actionpack>, ["= 3.0.13"])
- s.add_runtime_dependency(%q<mail>, ["~> 2.2.19"])
+ s.add_runtime_dependency(%q<mail>, ["~> 2.4.0"])
else
- s.add_dependency(%q<actionpack>, ["= 3.0.11"])
+ s.add_dependency(%q<actionpack>, ["= 3.0.13"])
- s.add_dependency(%q<mail>, ["~> 2.2.19"])
+ s.add_dependency(%q<mail>, ["~> 2.4.0"])
end
else
- s.add_dependency(%q<actionpack>, ["= 3.0.11"])
+ s.add_dependency(%q<actionpack>, ["= 3.0.13"])
- s.add_dependency(%q<mail>, ["~> 2.2.19"])
+ s.add_dependency(%q<mail>, ["~> 2.4.0"])
end
diff --git a/rubygem-actionmailer.spec b/rubygem-actionmailer.spec
index 7e33174..5812a7a 100644
--- a/rubygem-actionmailer.spec
+++ b/rubygem-actionmailer.spec
@@ -6,8 +6,8 @@
Summary: Service layer for easy email delivery and testing
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 3.0.11
-Release: 2%{?dist}
+Version: 3.0.13
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
@@ -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/actionmailer/
-# git checkout v3.0.11
-# tar czvf actionmailer-3.0.11-tests.tgz test/
+# git checkout v3.0.13
+# tar czvf actionmailer-3.0.13-tests.tgz test/
Source2: actionmailer-%{version}-tests.tgz
# Remove a task which breaks the Rakefile due to the gemspec
# not being present in the gem
Patch0: actionmailer-rakefile-fix.patch
-# Removes code which breaks the test suite due to a
-# dependency on a file in the greater rails proj
-Patch1: actionmailer-tests-fix.patch
-
# Updates mail dependency to version in Fedora
Patch2: actionmailer-update-mail-dep.patch
@@ -71,7 +67,6 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
pushd ./%{gem_instdir}
%patch0 -p0
-%patch1 -p0
popd
pushd ./%{gem_dir}
@@ -105,11 +100,14 @@ rm -rf %{buildroot}
%check
export GEM_PATH="$(pwd)/%{gem_dir}:%{gem_dir}"
pushd .%{gem_instdir}
+
+# load_path is not available, remove its require.
+sed -i '8,+1d' test/abstract_unit.rb
+
ruby -Itest -I. -e "Dir.glob('test/**/*_test.rb').each {|t| require t}"
popd
%files
-%defattr(-, root, root, -)
%dir %{gem_instdir}
%doc %{gem_instdir}/CHANGELOG
%{gem_instdir}/Rakefile
@@ -118,11 +116,14 @@ popd
%doc %{gem_instdir}/MIT-LICENSE
%doc %{gem_instdir}/README.rdoc
%doc %{gem_docdir}
-%{gem_cache}
+%exclude %{gem_cache}
%{gem_spec}
%changelog
+* Fri Jun 01 2012 Vít Ondruch <vondruch at redhat.com> - 1:3.0.13-1
+- Update to ActionMailer 3.0.13.
+
* Wed May 09 2012 Vít Ondruch <vondruch at redhat.com> - 1:3.0.11-2
- Fix Mailer dependencies.
diff --git a/sources b/sources
index 9be3d6b..8e65e13 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-24a30642870071eb324997da4199ac78 actionmailer-3.0.11-tests.tgz
-32691e0f2b8d5fad2283358f0dcbd3e1 actionmailer-3.0.11.gem
+e941f475f6f7f77f4450e09d4795294b actionmailer-3.0.13-tests.tgz
+aff3f004cc1f3f8009756514b18caac6 actionmailer-3.0.13.gem
More information about the scm-commits
mailing list