packages: ruby/ruby.spec - rel 2 - resolved problems with rails apps

[baggins]

Author: baggins                      Date: Fri Dec  9 22:05:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- resolved problems with rails apps

---- Files affected:
packages/ruby:
   ruby.spec (1.240 -> 1.241) 

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.240 packages/ruby/ruby.spec:1.241
--- packages/ruby/ruby.spec:1.240	Fri Dec  9 13:42:56 2011
+++ packages/ruby/ruby.spec	Fri Dec  9 23:05:42 2011
@@ -1,9 +1,6 @@
 # $Revision$, $Date$
 #
 # 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
@@ -32,7 +29,7 @@
 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
@@ -82,6 +79,8 @@
 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
@@ -483,6 +482,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241  2011/12/09 22:05:42  baggins
+- rel 2
+- resolved problems with rails apps
+
 Revision 1.240  2011/12/09 12:42:56  baggins
 - rel 0.1
 - breaks rails apps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby.spec?r1=1.240&r2=1.241&f=u