public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/rubygem-mail] epel10: Update to Mail 2.4.4.
Date: Fri, 20 Nov 2026 23:22:54 GMT	[thread overview]
Message-ID: <179521697450.1.2907544010652591064.rpms-rubygem-mail-f998071087bc@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/rubygem-mail
Branch : epel10
Commit : f998071087bcc5051bf6652cf415a1fd9c7200f3
Author : Vít Ondruch <vondruch@redhat.com>
Date   : 2012-05-09T16:28:08+02:00
Stats  : +25/-158 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-mail/c/f998071087bcc5051bf6652cf415a1fd9c7200f3?branch=epel10

Log:
Update to Mail 2.4.4.

---
diff --git a/.gitignore b/.gitignore
index 0bd2212..5359343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /rubygem-mail.spec
 /mail-2.3.0.gem
 /mail-2.3.0-specs.tgz
+/mail-2.4.4-specs.tgz
+/mail-2.4.4.gem

diff --git a/rubygem-mail-2.4.0-Change-MyDeliveryHandler-so-that-it-does-not-yield-t.patch b/rubygem-mail-2.4.0-Change-MyDeliveryHandler-so-that-it-does-not-yield-t.patch
deleted file mode 100644
index 1e676a4..0000000
--- a/rubygem-mail-2.4.0-Change-MyDeliveryHandler-so-that-it-does-not-yield-t.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f0ea8e460e48fe077ee29069248d86860ba98d66 Mon Sep 17 00:00:00 2001
-From: Derek Prior <derekprior@gmail.com>
-Date: Thu, 26 May 2011 12:43:23 -0400
-Subject: [PATCH] Change MyDeliveryHandler so that it does not yield to mail
-
----
- spec/mail/network_spec.rb |   15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/spec/mail/network_spec.rb b/spec/mail/network_spec.rb
-index 8f221b0..0ba4ab1 100644
---- a/spec/mail/network_spec.rb
-+++ b/spec/mail/network_spec.rb
-@@ -221,7 +221,8 @@ describe "Mail" do
-     
-     class MyDeliveryHandler
-       def deliver_mail(mail)
--        yield
-+        postman = MyDeliveryMethod.new
-+        postman.deliver!(mail)
-       end
-     end
- 
-@@ -290,7 +291,7 @@ describe "Mail" do
-       
-       it "should tell it's observers that it was told to deliver an email even if it is using a delivery_handler" do
-         Mail.register_observer(MyObserver)
--        @message.delivery_handler = MyDeliveryHandler.new
-+        @message.delivery_handler = MyYieldingDeliveryHandler.new
-         @message.perform_deliveries = false
-         MyObserver.should_receive(:delivered_email).with(@message).once
-         @message.deliver
-@@ -318,31 +319,31 @@ describe "Mail" do
-     describe "delivery_handler" do
-       
-       it "should allow you to hand off performing the actual delivery to another object" do
--        delivery_handler = MyDeliveryHandler.new
-+        delivery_handler = MyYieldingDeliveryHandler.new
-         delivery_handler.should_receive(:deliver_mail).with(@message).exactly(:once)
-         @message.delivery_handler = delivery_handler
-         @message.deliver
-       end
- 
-       it "mail should be told to :deliver once and then :deliver! once by the delivery handler" do
--        @message.delivery_handler = MyDeliveryHandler.new
-+        @message.delivery_handler = MyYieldingDeliveryHandler.new
-         @message.should_receive(:do_delivery).exactly(:once)
-         @message.deliver
-       end
- 
-       it "mail only call it's delivery_method once" do
--        @message.delivery_handler = MyDeliveryHandler.new
-+        @message.delivery_handler = MyYieldingDeliveryHandler.new
-         @message.should_receive(:delivery_method).exactly(:once).and_return(Mail::TestMailer.new({}))
-         @message.deliver
-       end
- 
-       it "mail should not catch any exceptions when using a delivery_handler" do
--        @message.delivery_handler = MyDeliveryHandler.new
-+        @message.delivery_handler = MyYieldingDeliveryHandler.new
-         @message.should_receive(:delivery_method).and_raise(Exception)
-         doing { @message.deliver }.should raise_error(Exception)
-       end
- 
--      it "mail should not modify the Mail.deliveries object if using a delivery_handler" do
-+      it "mail should not modify the Mail.deliveries object if using a delivery_handler that does not append to deliveries" do
-         @message.delivery_handler = MyDeliveryHandler.new
-         doing { @message.deliver }.should_not change(Mail::TestMailer, :deliveries)
-       end
--- 
-1.7.7.5
-

diff --git a/rubygem-mail-2.4.0-Fix-false-failure-in-Ruby-1.9.3.patch b/rubygem-mail-2.4.0-Fix-false-failure-in-Ruby-1.9.3.patch
deleted file mode 100644
index 5cabf33..0000000
--- a/rubygem-mail-2.4.0-Fix-false-failure-in-Ruby-1.9.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 25801d4c8de10a69984ec81768ad1c2849f7b997 Mon Sep 17 00:00:00 2001
-From: Mikel Lindsaar <mikel@rubyx.com>
-Date: Sat, 14 Jan 2012 09:21:11 +1030
-Subject: [PATCH] Fix false failure in Ruby-1.9.3
-
-Alias for SJIS was changed from shift_jis to windows-31J per this changelog:
-
-Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
-	  [ruby-dev:43027] fixes #4280
----
- spec/mail/fields/content_type_field_spec.rb |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/spec/mail/fields/content_type_field_spec.rb b/spec/mail/fields/content_type_field_spec.rb
-index 8a2d704..7574567 100644
---- a/spec/mail/fields/content_type_field_spec.rb
-+++ b/spec/mail/fields/content_type_field_spec.rb
-@@ -614,7 +614,11 @@ describe Mail::ContentTypeField do
-       end
-       c = Mail::ContentTypeField.new('application/octet-stream')
-       string = "01 Quien Te Dij\221at. Pitbull.mp3"
--      if RUBY_VERSION >= '1.9'
-+      case 
-+      when RUBY_VERSION >= '1.9.3'
-+        string.force_encoding('SJIS')
-+        result = %Q{Content-Type: application/octet-stream;\r\n\sfilename*=windows-31j'jp'01%20Quien%20Te%20Dij%91%61t.%20Pitbull.mp3\r\n}
-+      when RUBY_VERSION >= '1.9'
-         string.force_encoding('SJIS')
-         result = %Q{Content-Type: application/octet-stream;\r\n\sfilename*=shift_jis'jp'01%20Quien%20Te%20Dij%91%61t.%20Pitbull.mp3\r\n}
-       else
--- 
-1.7.7.5
-

diff --git a/rubygem-mail-2.4.0-In-1.9.3-Array-uses-clone-so-returns-an-Array-instea.patch b/rubygem-mail-2.4.0-In-1.9.3-Array-uses-clone-so-returns-an-Array-instea.patch
deleted file mode 100644
index 9ef86c4..0000000
--- a/rubygem-mail-2.4.0-In-1.9.3-Array-uses-clone-so-returns-an-Array-instea.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d88fa14c8321f73b740818551d2c501afcb5b153 Mon Sep 17 00:00:00 2001
-From: Mikel Lindsaar <mikel@rubyx.com>
-Date: Sat, 14 Jan 2012 09:34:54 +1030
-Subject: [PATCH] In 1.9.3 Array uses clone so returns an Array instead of a
- PartsList
-
----
- lib/mail/parts_list.rb |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lib/mail/parts_list.rb b/lib/mail/parts_list.rb
-index 74fa653..38c465f 100644
---- a/lib/mail/parts_list.rb
-+++ b/lib/mail/parts_list.rb
-@@ -26,6 +26,10 @@ module Mail
-       raise NoMethodError, "#collect! is not defined, please call #collect and create a new PartsList"
-     end
- 
-+    def sort
-+      self.class.new(super)
-+    end
-+
-     def sort!(order)
-       sorted = self.sort do |a, b|
-         # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
--- 
-1.7.7.5
-

diff --git a/rubygem-mail.spec b/rubygem-mail.spec
index cac3fd3..1d44ff7 100644
--- a/rubygem-mail.spec
+++ b/rubygem-mail.spec
@@ -4,20 +4,15 @@
 
 Summary: Mail provides a nice Ruby DSL for making, sending and reading emails
 Name: rubygem-%{gem_name}
-Version: 2.3.0
-Release: 3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/mikel/mail
 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
-# git clone https://github.com/mikel/mail.git && cd mail && git checkout 2.3.0
-# tar czvf mail-2.3.0-specs.tgz spec/
+# git clone https://github.com/mikel/mail.git && cd mail && git checkout 2.4.4
+# tar czvf mail-2.4.4-specs.tgz spec/
 Source1: %{gem_name}-%{version}-specs.tgz
-# https://github.com/mikel/mail/issues/318
-Patch0: rubygem-mail-2.4.0-Fix-false-failure-in-Ruby-1.9.3.patch
-Patch1: rubygem-mail-2.4.0-In-1.9.3-Array-uses-clone-so-returns-an-Array-instea.patch
-# https://github.com/mikel/mail/issues/305
-Patch2: rubygem-mail-2.4.0-Change-MyDeliveryHandler-so-that-it-does-not-yield-t.patch
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: rubygem(mime-types) >= 1.16
@@ -50,7 +45,9 @@ This package contains documentation for %{name}.
 %prep
 %setup -q -c -T
 mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
+# Gem install encoding conversion errors.
+# https://github.com/mikel/mail/issues/393
+LANG=en_US.utf8 gem install --local --install-dir .%{gem_dir} \
             --force %{SOURCE0}
 
 %build
@@ -64,29 +61,31 @@ cp -a .%{gem_dir}/* \
 tar xzvf %{SOURCE1} -C .%{gem_instdir}
 pushd .%{gem_instdir}
 
-cat %{PATCH0} | patch -p1
-cat %{PATCH1} | patch -p1
-cat %{PATCH2} | patch -p1
-
+# Test suite does assumptions about encoding.
+# https://github.com/mikel/mail/issues/392
 LANG=en_US.utf8 rspec -rmail/fields/common/common_address spec
 popd
 
 %files
 %dir %{gem_instdir}
 %{gem_libdir}
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
-%doc %{gem_instdir}/README.rdoc
-%doc %{gem_instdir}/Gemfile
-%doc %{gem_instdir}/Rakefile
+%doc %{gem_instdir}/README.md
 
 %files doc
-%{gem_docdir}
-%{gem_instdir}/CHANGELOG.rdoc
-%{gem_instdir}/Dependencies.txt
-%{gem_instdir}/TODO.rdoc
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.rdoc
+%doc %{gem_instdir}/CONTRIBUTING.md
+%doc %{gem_instdir}/Dependencies.txt
+%doc %{gem_instdir}/TODO.rdoc
+%doc %{gem_instdir}/Gemfile*
+%doc %{gem_instdir}/Rakefile
 
 %changelog
+* Wed May 09 2012 Vít Ondruch <vondruch@redhat.com> - 2.4.4-1
+- Update to Mail 2.4.4.
+
 * Tue Jan 31 2012 Vít Ondruch <vondruch@redhat.com> - 2.3.0-3
 - Rebuilt for Ruby 1.9.3.
 

diff --git a/sources b/sources
index ff11f0d..ef15ed6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0ea460680e376e294984866bd9364e30  mail-2.3.0-specs.tgz
-da4561f0362889f20e38049e8a132e54  mail-2.3.0.gem
+57e50f68d7042aab23c0de6742199d1e  mail-2.4.4-specs.tgz
+bacad77f57d123cf58de6c2de47d19b0  mail-2.4.4.gem

                 reply	other threads:[~2026-11-20 23:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179521697450.1.2907544010652591064.rpms-rubygem-mail-f998071087bc@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox