SPECS: gnome-utils.spec - merged P/O from AC-branch (bigger merge ...

[blues]

Author: blues                        Date: Tue May 23 18:21:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged P/O from AC-branch (bigger merge is needed...)

---- Files affected:
SPECS:
   gnome-utils.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/gnome-utils.spec
diff -u SPECS/gnome-utils.spec:1.134 SPECS/gnome-utils.spec:1.135
--- SPECS/gnome-utils.spec:1.134	Sun Apr  2 16:37:48 2006
+++ SPECS/gnome-utils.spec	Tue May 23 20:21:03 2006
@@ -7,7 +7,7 @@
 Summary(zh_CN):	GNOMEÓŚÓĂłĚĐňźŻ
 Name:		gnome-utils
 Version:	2.14.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		X11/Applications
@@ -112,7 +112,9 @@
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gnome-utils-dict
 Obsoletes:	gnome-dict
+Obsoletes:	gnome-utils-dict
 Conflicts:	gnome-utils <= 0:2.10.0-1
 
 %description dictionary
@@ -355,6 +357,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2006/05/23 18:21:03  blues
+- merged P/O from AC-branch (bigger merge is needed...)
+
 Revision 1.134  2006/04/02 14:37:48  freetz
 - merged from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.134&r2=1.135&f=u