From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH 2/3] gemspec: relax Ruby version requirement for old RubyGems
Date: Sun, 1 Nov 2015 08:37:46 +0000 [thread overview]
Message-ID: <20151101083747.23877-3-e@80x24.org> (raw)
In-Reply-To: <20151101083747.23877-1-e@80x24.org>
Older RubyGems (1.8.23.2 at least) does not seem to support
multiple version requirements for the Ruby version; so drop
the lower 1.9.3 requirement for now.
---
unicorn.gemspec | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/unicorn.gemspec b/unicorn.gemspec
index 23450f5..1099361 100644
--- a/unicorn.gemspec
+++ b/unicorn.gemspec
@@ -25,7 +25,11 @@ Gem::Specification.new do |s|
s.files = manifest
s.homepage = Olddoc.config['rdoc_url']
s.test_files = test_files
- s.required_ruby_version = [ '>= 1.9.3', '< 3.0' ]
+
+ # technically we need ">= 1.9.3", too, but avoid the array here since
+ # old rubygems versions (1.8.23.2 at least) do not support multiple
+ # version requirements here.
+ s.required_ruby_version = '< 3.0'
# for people that are absolutely stuck on Rails 2.3.2 and can't
# up/downgrade to any other version, the Rack dependency may be
@@ -38,5 +42,9 @@ Gem::Specification.new do |s|
s.add_development_dependency('test-unit', '~> 3.0')
s.add_development_dependency('olddoc', '~> 1.0')
- s.licenses = ["GPLv2+", "Ruby 1.8"]
+ # Note: To avoid ambiguity, we intentionally avoid the SPDX-compatible
+ # 'Ruby' here since Ruby 1.9.3 switched to BSD-2-Clause, but we
+ # inherited our license from Mongrel when Ruby was at 1.8.
+ # We cannot automatically switch licenses when Ruby changes.
+ s.licenses = ['GPL-2.0+', 'Ruby-1.8']
end
--
EW
next prev parent reply other threads:[~2015-11-01 8:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 8:37 [PATCH 0/3] last updates before 5.0 release Eric Wong
2015-11-01 8:37 ` [PATCH 1/3] golf down conditional for socket activation Eric Wong
2015-11-01 8:37 ` Eric Wong [this message]
2015-11-01 8:37 ` [PATCH 3/3] doc updates Eric Wong
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
List information: https://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151101083747.23877-3-e@80x24.org \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.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.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/unicorn.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).