Merged r9341 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9342 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index e6181298a90729e6ab2ff2f48877c9e6d0f019d8..50439f10af11b20d22267de3459c81984fc6e195 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -16,12 +16,14 @@ group :openid do
   gem "ruby-openid", "~> 2.1.4", :require => "openid"
 end
 
-# Optional gem for exporting the gantt to a PNG file
-group :rmagick do
-  # RMagick 2 supports ruby 1.9
-  # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-  # different requirements for the same gem on different platforms
-  gem "rmagick", ">= 2.0.0"
+# Optional gem for exporting the gantt to a PNG file, not supported with jruby
+platforms :mri, :mingw do
+  group :rmagick do
+    # RMagick 2 supports ruby 1.9
+    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+    # different requirements for the same gem on different platforms
+    gem "rmagick", ">= 2.0.0"
+  end
 end
 
 # Database gems