rpms/kdebase-workspace/devel kdebase-workspace.spec,1.2,1.3

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
Obsoletes and Provides kdebase-kdm for upgrades from old kde-redhat


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-workspace.spec	30 Nov 2007 20:55:29 -0000	1.2
+++ kdebase-workspace.spec	1 Dec 2007 06:48:45 -0000	1.3
@@ -6,7 +6,7 @@
 Name:           kdebase-workspace
 Version:        3.96.1
 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2
 
 License:        GPLv2
@@ -18,6 +18,10 @@
 Patch1:         kdebase-workspace-3.96.1-redhat-startkde.patch
 Patch2:         kdebase-workspace-3.96.1-consolekit-kdm.patch
 
+# upgrade path for former kde-redhat'ers
+Obsoletes: kdebase-kdm < 6:%{version}-%{release}
+Provides:  kdebase-kdm = 6:%{version}-%{release}
+
 BuildRequires: bluez-libs-devel
 BuildRequires: cmake
 BuildRequires: glib2-devel
@@ -192,6 +196,9 @@
 
 
 %changelog
+* Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.1-4
+- Obsoletes and Provides kdebase-kdm for upgrades from old kde-redhat
+
 * Fri Nov 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.1-3
 - update and apply redhat-startkde patch
 - update and apply KDM ConsoleKit patch (#228111, kde#147790)