[rubygem-actionmailer] Update to ActionMailer 3.2.6.

Bohuslav Kabrda bkabrda at fedoraproject.org
Mon Jul 23 08:49:31 UTC 2012


commit 06afe31074ed6c37e1828457f2c07fa949da11aa
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jul 23 10:48:55 2012 +0200

    Update to ActionMailer 3.2.6.
    
    - Don't run tests using Rakefile.
    - Introduced -doc subpackage.

 .gitignore                         |    2 +
 Rakefile                           |   36 --------------------
 actionmailer-rakefile-fix.patch    |   15 --------
 actionmailer-update-mail-dep.patch |   19 -----------
 rubygem-actionmailer.spec          |   63 +++++++++++++++--------------------
 sources                            |    4 +-
 6 files changed, 31 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe3de70..1436cbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ actionmailer-2.3.5.gem
 /actionmailer-3.0.13.gem
 /actionmailer-3.0.15-tests.tgz
 /actionmailer-3.0.15.gem
+/actionmailer-3.2.6-tests.tgz
+/actionmailer-3.2.6.gem
diff --git a/rubygem-actionmailer.spec b/rubygem-actionmailer.spec
index 37ebccc..b71de86 100644
--- a/rubygem-actionmailer.spec
+++ b/rubygem-actionmailer.spec
@@ -6,51 +6,48 @@
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 3.0.15
-Release: 2%{?dist}
+Version: 3.2.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 
 Source0: http://rubygems.org/downloads/actionmailer-%{version}.gem
 
-# The actionmailer gem doesn't ship with the upstream Rakefile
-Source1: http://github.com/rails/rails/raw/v%{version}/%{gem_name}/Rakefile
-
 # Also the actionmailer gem doesn't ship with the test suite.
 # You may check it out like so
 # git clone http://github.com/rails/rails.git
 # cd rails/actionmailer/
-# git checkout v3.0.15
-# tar czvf actionmailer-3.0.15-tests.tgz test/
+# git checkout v3.2.6
+# tar czvf actionmailer-3.2.6-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
-
-# Updates mail dependency to version in Fedora
-Patch2: actionmailer-update-mail-dep.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(rubygems)
 Requires: rubygem(actionpack) = %{version}
-Requires: rubygem(text-format)
-Requires: rubygem(mail) >= 2.3.0
+Requires: rubygem(mail) >= 2.4.4
+Requires: rubygem(mail) < 2.5
 Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems-devel
-BuildRequires: rubygem(rake)
 BuildRequires: rubygem(actionpack) = %{version}
-BuildRequires: rubygem(text-format)
-BuildRequires: rubygem(mail) >= 2.3.0
-BuildRequires: rubygem(mocha)
+BuildRequires: rubygem(mail) >= 2.4.4
+BuildRequires: rubygem(mail) < 2.5
 BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(mocha)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Makes it trivial to test and deliver emails sent from a single service layer.
 
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires:%{name} = %{version}-%{release}
+
+%description doc
+Documentation for %{name}
 
 %prep
 %setup -q -c -T
@@ -59,20 +56,9 @@ gem install --local --install-dir .%{gem_dir} \
             -V \
             --force --rdoc %{SOURCE0}
 
-# move the Rakefile in place
-cp %{SOURCE1} .%{gem_instdir}
-
 # move the tests into place
 tar xzvf %{SOURCE2} -C .%{gem_instdir}
 
-pushd ./%{gem_instdir}
-%patch0 -p0
-popd
-
-pushd ./%{gem_dir}
-%patch2 -p0
-popd
-
 # Remove backup files
 find ./%{gem_instdir} -type f -name "*~" -delete
 
@@ -109,18 +95,23 @@ popd
 
 %files
 %dir %{gem_instdir}
-%doc %{gem_instdir}/CHANGELOG
-%{gem_instdir}/Rakefile
-%{gem_instdir}/test
 %{gem_libdir}
 %doc %{gem_instdir}/MIT-LICENSE
-%doc %{gem_instdir}/README.rdoc
-%doc %{gem_docdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
+%files doc
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/README.rdoc
+%{gem_instdir}/test
 
 %changelog
+* Mon Jul 23 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1:3.2.6-1
+- Update to ActionMailer 3.2.6.
+- Don't run tests using Rakefile.
+- Introduced -doc subpackage.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 4ab7d22..731d531 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c6ad5b151f965fa7466c63149d4bc18b  actionmailer-3.0.15-tests.tgz
-9ff686271bef9a0f30c44167da00f97a  actionmailer-3.0.15.gem
+d2f0b250f2d284e448433dcbee9ef866  actionmailer-3.2.6-tests.tgz
+393813a6164ac150a707d69bc1300b2a  actionmailer-3.2.6.gem


More information about the scm-commits mailing list