rpms/kdebase/devel kdebase.spec,1.284,1.285

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21025/devel

Modified Files:
	kdebase.spec 
Log Message:
* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
- Obsoletes: dolphin, d3lphin, Provides: dolphin (F9+)


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- kdebase.spec	14 Dec 2007 19:01:19 -0000	1.284
+++ kdebase.spec	25 Dec 2007 11:53:39 -0000	1.285
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.97.0
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -33,8 +33,14 @@
 Requires: eject
 %endif
 
+Provides:      dolphin = 0.9.5-1
+%if 0%{fedora} >= 9
+Obsoletes:     dolphin < 0.9.5-1
+Obsoletes:     d3lphin
+%else
 # should not conflict with d3lphin, but does with old Dolphin
 Conflicts:     dolphin <= 0.8.2
+%endif
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -268,6 +274,9 @@
 
 
 %changelog
+* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
+- Obsoletes: dolphin, d3lphin, Provides: dolphin (F9+)
+
 * Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
 - Obsoletes: -extras (f9+)