diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec index 7c779b9..89b31f8 100644 --- a/kdebase-workspace.spec +++ b/kdebase-workspace.spec @@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspace 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 @@ Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch 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 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %changelog +* Wed Jul 23 2008 Kevin Kofler 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 4.0.99-4 - oxygen-cursor-themes, -wallpapers subpkgs