SPECS: rails.spec, php-pear-Text_Highlighter.spec - php-pear-Text_...

[glen]

Author: glen                         Date: Sun Jul 10 13:05:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- php-pear-Text_Highlighter cnfl rails

---- Files affected:
SPECS:
   rails.spec (1.11 -> 1.12) , php-pear-Text_Highlighter.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/rails.spec
diff -u SPECS/rails.spec:1.11 SPECS/rails.spec:1.12
--- SPECS/rails.spec:1.11	Sat Jul  9 23:18:53 2005
+++ SPECS/rails.spec	Sun Jul 10 15:05:13 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - error: php-pear-Text_Highlighter-0.6.5-1 (cnfl rails = 0.12.1-1) conflicts with installed rails-0.12.1-1
 %define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
 %define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:	Ruby on Rails setup scripts
@@ -81,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/07/10 13:05:13  glen
+- php-pear-Text_Highlighter cnfl rails
+
 Revision 1.11  2005/07/09 21:18:53  aredridel
 - R: rake >= 0.5.4
 

================================================================
Index: SPECS/php-pear-Text_Highlighter.spec
diff -u SPECS/php-pear-Text_Highlighter.spec:1.13 SPECS/php-pear-Text_Highlighter.spec:1.14
--- SPECS/php-pear-Text_Highlighter.spec:1.13	Thu May  5 14:03:59 2005
+++ SPECS/php-pear-Text_Highlighter.spec	Sun Jul 10 15:05:13 2005
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
-# ToDo:
+# TODO:
 # - think about renaming generate script
+# - error: php-pear-Text_Highlighter-0.6.5-1 (cnfl rails = 0.12.1-1) conflicts with installed rails-0.12.1-1
 %include	/usr/lib/rpm/macros.php
 %define		_class		Text
 %define		_subclass	Highlighter
@@ -88,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/07/10 13:05:13  glen
+- php-pear-Text_Highlighter cnfl rails
+
 Revision 1.13  2005/05/05 12:03:59  ankry
 - some unifications
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rails.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Text_Highlighter.spec?r1=1.13&r2=1.14&f=u