Skip to content

Commit

Permalink
www/redmine50: Fix build rubygem-roadie-rails-rails61 3.1.0
Browse files Browse the repository at this point in the history
PR:		277866
  • Loading branch information
MikaelUrankar committed Mar 22, 2024
1 parent 44af6de commit c0b038e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions www/redmine50/files/patch-Gemfile
@@ -1,6 +1,6 @@
--- Gemfile.orig 2023-11-27 20:30:01 UTC
+++ Gemfile
@@ -3,30 +3,30 @@ source 'https://rubygems.org'
@@ -3,30 +3,30 @@ gem 'bundler', '>= 1.12.0'
ruby '>= 2.5.0', '< 3.2.0'
gem 'bundler', '>= 1.12.0'

Expand All @@ -12,7 +12,8 @@
gem 'request_store', '~> 1.5.0'
gem 'mini_mime', '~> 1.1.0'
gem "actionpack-xml_parser"
gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0')
-gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0')
+gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '>= 3.0.0')
gem 'marcel'
-gem "mail", "~> 2.7.1"
+gem "mail", ">= 2.7.1"
Expand Down Expand Up @@ -40,7 +41,7 @@
gem 'net-pop', '~> 0.1.1'
# Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590
gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0')
@@ -40,85 +40,10 @@ gem 'rqrcode'
@@ -40,85 +40,10 @@ group :ldap do

# Optional gem for LDAP authentication
group :ldap do
Expand Down Expand Up @@ -127,7 +128,7 @@
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exist?(local_gemfile)
eval_gemfile local_gemfile
@@ -127,4 +52,8 @@ end
@@ -127,4 +52,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi
# Load plugins' Gemfiles
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
eval_gemfile file
Expand Down

0 comments on commit c0b038e

Please sign in to comment.