rpms/kdebase-workspace/devel kdebase-workspace.spec,1.110,1.111

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.99-5
- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or
  Require kdebase, as kdebase now requires kdebase-workspace, obviating the
  upgrade path hack


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdebase-workspace.spec	22 Jul 2008 17:58:42 -0000	1.110
+++ kdebase-workspace.spec	22 Jul 2008 23:23:01 -0000	1.111
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.0.99
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -39,10 +39,12 @@
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
 
+%if 0%{?fedora} == 9
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
 # so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
 Requires: kdebase4
+%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -299,6 +301,11 @@
 
 
 %changelog
+* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.99-5
+- F10+: fix circular kdebase<->kdebase-workspace dependency: don't Obsolete or
+  Require kdebase, as kdebase now requires kdebase-workspace, obviating the
+  upgrade path hack
+
 * Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-4
 - oxygen-cursor-themes, -wallpapers subpkgs