public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-mail] epel10: Fix Ruby 2.4 deprecation warnings.
@ 2026-11-20 23:23
0 siblings, 0 replies; only message in thread
From: @ 2026-11-20 23:23 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rubygem-mail
Branch : epel10
Commit : f1fc3434c7bb05915848712f79392c03ad56e167
Author : Vít Ondruch <vondruch@redhat.com>
Date : 2017-01-23T15:20:43+01:00
Stats : +110/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/rubygem-mail/c/f1fc3434c7bb05915848712f79392c03ad56e167?branch=epel10
Log:
Fix Ruby 2.4 deprecation warnings.
---
diff --git a/mail-2.6.4-Fix-deprecated-warnings-in-Ruby-2.4.0.patch b/mail-2.6.4-Fix-deprecated-warnings-in-Ruby-2.4.0.patch
new file mode 100644
index 0000000..01d3556
--- /dev/null
+++ b/mail-2.6.4-Fix-deprecated-warnings-in-Ruby-2.4.0.patch
@@ -0,0 +1,59 @@
+From e8fde9cf1d77ee7e465c12e809501df8d27e8451 Mon Sep 17 00:00:00 2001
+From: Koichi ITO <koic.ito@gmail.com>
+Date: Sun, 4 Dec 2016 12:33:06 +0800
+Subject: [PATCH] Fix deprecated warnings in Ruby 2.4.0+
+
+---
+ lib/mail/attachments_list.rb | 2 +-
+ lib/mail/multibyte/chars.rb | 4 ++--
+ lib/mail/network/retriever_methods/test_retriever.rb | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/mail/attachments_list.rb b/lib/mail/attachments_list.rb
+index bb34a85..14fe31c 100644
+--- a/lib/mail/attachments_list.rb
++++ b/lib/mail/attachments_list.rb
+@@ -30,7 +30,7 @@ module Mail
+ # mail.attachments['test.png'].filename #=> 'test.png'
+ # mail.attachments[1].filename #=> 'test.jpg'
+ def [](index_value)
+- if index_value.is_a?(Fixnum)
++ if index_value.is_a?(Integer)
+ self.fetch(index_value)
+ else
+ self.select { |a| a.filename == index_value }.first
+diff --git a/lib/mail/multibyte/chars.rb b/lib/mail/multibyte/chars.rb
+index bb39897..2e431ca 100644
+--- a/lib/mail/multibyte/chars.rb
++++ b/lib/mail/multibyte/chars.rb
+@@ -269,12 +269,12 @@ module Mail #:nodoc:
+ @wrapped_string[*args] = replace_by
+ else
+ result = Unicode.u_unpack(@wrapped_string)
+- if args[0].is_a?(Fixnum)
++ if args[0].is_a?(Integer)
+ raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
+ min = args[0]
+ max = args[1].nil? ? min : (min + args[1] - 1)
+ range = Range.new(min, max)
+- replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
++ replace_by = [replace_by].pack('U') if replace_by.is_a?(Integer)
+ elsif args.first.is_a?(Range)
+ raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
+ range = args[0]
+diff --git a/lib/mail/network/retriever_methods/test_retriever.rb b/lib/mail/network/retriever_methods/test_retriever.rb
+index 9bb3e1a..dfbc909 100644
+--- a/lib/mail/network/retriever_methods/test_retriever.rb
++++ b/lib/mail/network/retriever_methods/test_retriever.rb
+@@ -25,7 +25,7 @@ module Mail
+ emails_index.reverse! if options[:what] == :last
+ emails_index = case count = options[:count]
+ when :all then emails_index
+- when Fixnum then emails_index[0, count]
++ when Integer then emails_index[0, count]
+ else
+ raise 'Invalid count option value: ' + count.inspect
+ end
+--
+2.11.0
+
diff --git a/mail-2.6.4-fix-new-warning-in-ruby-2.4.patch b/mail-2.6.4-fix-new-warning-in-ruby-2.4.patch
new file mode 100644
index 0000000..af45560
--- /dev/null
+++ b/mail-2.6.4-fix-new-warning-in-ruby-2.4.patch
@@ -0,0 +1,38 @@
+From 48cb6db25b31eebe7bdd330d812c52d3c93aa328 Mon Sep 17 00:00:00 2001
+From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
+Date: Tue, 13 Dec 2016 07:50:42 +0900
+Subject: [PATCH] fix new warning in ruby 2.4
+
+This fixes the following warning.
+
+```
+/home/travis/build/mikel/mail/lib/mail/fields/common/address_container.rb:11: warning: parentheses after method name is interpreted as
+/home/travis/build/mikel/mail/lib/mail/fields/common/address_container.rb:11: warning: an argument list, not a decomposed argument
+```
+
+Ref: https://github.com/ruby/ruby/commit/65e27c8b138d6959608658ffce2fa761842b8d24
+---
+ lib/mail/fields/common/address_container.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/mail/fields/common/address_container.rb b/lib/mail/fields/common/address_container.rb
+index f4a5aec..48c1286 100644
+--- a/lib/mail/fields/common/address_container.rb
++++ b/lib/mail/fields/common/address_container.rb
+@@ -8,10 +8,10 @@ module Mail
+ super(list)
+ end
+
+- def << (address)
++ def <<(address)
+ @field << address
+ end
+
+ end
+
+-end
+\ No newline at end of file
++end
+--
+2.11.0
+
diff --git a/rubygem-mail.spec b/rubygem-mail.spec
index 78fd1b5..7937e46 100644
--- a/rubygem-mail.spec
+++ b/rubygem-mail.spec
@@ -3,7 +3,7 @@
Name: rubygem-%{gem_name}
Version: 2.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Mail provides a nice Ruby DSL for making, sending and reading emails
Group: Development/Languages
License: MIT
@@ -12,6 +12,11 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# git clone https://github.com/mikel/mail.git && cd mail
# git checkout 2.6.4 && tar czvf mail-2.6.4-specs.tgz spec/
Source1: %{gem_name}-%{version}-specs.tgz
+# Fix Ruby 2.4 compatibility.
+# https://github.com/mikel/mail/commit/e8fde9cf1d77ee7e465c12e809501df8d27e8451
+Patch0: mail-2.6.4-Fix-deprecated-warnings-in-Ruby-2.4.0.patch
+# https://github.com/mikel/mail/commit/48cb6db25b31eebe7bdd330d812c52d3c93aa328
+Patch1: mail-2.6.4-fix-new-warning-in-ruby-2.4.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@@ -35,6 +40,10 @@ Documentation for %{name}.
%setup -q -c -T
%gem_install -n %{SOURCE0}
+pushd .%{gem_instdir}
+%patch0 -p1
+%patch1 -p1
+popd
%build
@@ -70,6 +79,9 @@ popd
%doc %{gem_instdir}/TODO.rdoc
%changelog
+* Mon Jan 23 2017 Vít Ondruch <vondruch@redhat.com> - 2.6.4-2
+- Fix Ruby 2.4 deprecation warnings.
+
* Thu Jun 30 2016 Vít Ondruch <vondruch@redhat.com> - 2.6.4-1
- Update to Mail 2.6.4.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-20 23:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 23:23 [rpms/rubygem-mail] epel10: Fix Ruby 2.4 deprecation warnings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox