SPECS: kde4-kdesupport.spec - kill Conflicts

[shadzik]

Author: shadzik                      Date: Sat May 24 16:55:10 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill Conflicts

---- Files affected:
SPECS:
   kde4-kdesupport.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdesupport.spec
diff -u SPECS/kde4-kdesupport.spec:1.1 SPECS/kde4-kdesupport.spec:1.2
--- SPECS/kde4-kdesupport.spec:1.1	Sat May 24 18:23:17 2008
+++ SPECS/kde4-kdesupport.spec	Sat May 24 18:55:05 2008
@@ -28,7 +28,6 @@
 Group:		X11/Applications
 Provides:	soprano
 Obsoletes:	soprano
-Conflicts:	soprano
 
 %description soprano
 Soprano (formally known as QRDF) is a library which provides a Qt
@@ -49,7 +48,6 @@
 Group:		X11/Applications
 Provides:	strigi
 Obsoletes:	strigi
-Conflicts:	strigi
 
 %description strigi
 Here are the main features of Strigi Desktop Search: very fast
@@ -79,7 +77,6 @@
 Group:		X11/Applications
 Provides:	akonadi
 Obsoletes:	akonadi
-Conflicts:	akonadi
 
 %description akonadi
 Akonadi.
@@ -97,7 +94,6 @@
 Group:		X11/Libraries
 Provides:	taglib
 Obsoletes:	taglib
-Conflicts:	taglib
 
 %description taglib
 A tag library needed for juk application which is part of
@@ -116,7 +112,6 @@
 Group:		X11/Applications
 Provides:	kde4-automoc
 Obsoletes:	kde4-automoc
-Conflicts:	kde4-automoc
 
 %description automoc4
 Automoc4.
@@ -126,7 +121,6 @@
 Group:		X11/Applications
 Provides:	qimageblitz
 Obsoletes:	qimageblitz
-Conflicts:	qimageblitz
 
 %description qimageblitz
 QimageBlitz.
@@ -320,6 +314,9 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.2  2008-05-24 16:55:05  shadzik
+- kill Conflicts
+
 Revision 1.1  2008-05-24 16:23:17  shadzik
 - initial
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdesupport.spec?r1=1.1&r2=1.2&f=u