rpms/kdebase-workspace/devel kdebase-workspace.spec,1.33,1.34

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-6
- revert Conflicts, it matches against Provides from kdelibs3.



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kdebase-workspace.spec	6 Feb 2008 13:21:06 -0000	1.33
+++ kdebase-workspace.spec	6 Feb 2008 17:44:52 -0000	1.34
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.1
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -28,9 +28,6 @@
 
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
-# ease upgrade pain, help folks avoid shooting themselves in the foot 
-# hopefully only temporary
-Conflicts: kdelibs < 6:4
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -223,6 +220,9 @@
 
 
 %changelog
+* Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-6
+- revert Conflicts, it matches against Provides from kdelibs3.
+
 * Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-5
 - Conflicts: kdelibs < 6:4 (temporary, to ease upgrade pain)
 - -devel: Requires: %%name-libs