rpms/kdelibs/devel kdelibs.spec,1.497,1.498

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22062

Modified Files:
	kdelibs.spec 
Log Message:
* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-4
- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- kdelibs.spec	26 Jul 2009 03:41:30 -0000	1.497
+++ kdelibs.spec	29 Jul 2009 20:40:53 -0000	1.498
@@ -5,7 +5,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.98
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -162,6 +162,9 @@ This package includes the common files f
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+# stuff moved, help upgrade path
+Conflicts: kdebase-runtime < 4.2.90
+Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
@@ -409,6 +412,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-4
+- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
+
 * Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.98-3
 - fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references