rpms/kdebase4/F-8 kdebase4.spec,1.8,1.9

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28531/F-8

Modified Files:
	kdebase4.spec 
Log Message:
Sync from devel:

* Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2.1
- Obsoletes: dolphin, d3lphin, Provides: dolphin everywhere


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdebase4.spec	10 Jan 2008 23:52:44 -0000	1.8
+++ kdebase4.spec	19 Jan 2008 19:14:35 -0000	1.9
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       4.0.0
-Release:       2%{?dist}
+Release:       2%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -33,14 +33,9 @@
 Requires: eject
 %endif
 
-%if 0%{fedora} >= 9
 Provides:      dolphin = 0.9.5-1
 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
@@ -274,6 +269,9 @@
 
 
 %changelog
+* Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2.1
+- Obsoletes: dolphin, d3lphin, Provides: dolphin everywhere
+
 * Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-2
 - respun tarball