- rel 2

- resolved problems with rails apps

Changed files:
    ruby.spec -> 1.241

diff --git a/ruby.spec b/ruby.spec
index 50f09644360e80c94b06cab2c2e95c2cf88e06e0..fd77830221858f1cccde52d63097b75ec7d896ed 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,8 +1,5 @@
 #
 # TODO:
-#      !!!
-#      - 1.9.3 breaks all rails apps, see https://www.chiliproject.org/boards/1/topics/973
-#      !!!
 #      - include ext/ in docs
 #      - replace ri with fastri
 #      - patch ri to search multiple indexes (one per package), so RPMs can
@@ -31,7 +28,7 @@ Summary(pt_BR.UTF-8): Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):  ruby - 一种快速高效的面向对象脚本编程语言
 Name:          ruby
 Version:       %{basever}.%{patchlevel}
-Release:       0.1
+Release:       2
 Epoch:         1
 License:       The Ruby License
 Group:         Development/Languages
@@ -81,6 +78,8 @@ Obsoletes:    ruby-json
 Obsoletes:     ruby-rake
 Obsoletes:     ruby-rubygems
 %endif
+Conflicts:     ruby-activesupport < 2.3.11-2
+Conflicts:     ruby-activesupport2 < 2.3.11-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # bleh, some nasty (gcc or ruby) bug still not fixed