rpms/kdelibs/devel kdelibs.spec,1.562,1.563

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdelibs.spec 
Log Message:
* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-6
- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -p -r1.562 -r1.563
--- kdelibs.spec	27 Dec 2009 02:05:02 -0000	1.562
+++ kdelibs.spec	27 Dec 2009 10:53:38 -0000	1.563
@@ -13,7 +13,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -94,6 +94,10 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 ## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
+%if 0%{?fedora} && 0%{?fedora} < 13
+Conflicts: kdebase-workspace-libs < 4.3.80
+%endif
+
 BuildRequires: qt4-devel >= 4.6.0
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
@@ -163,8 +167,12 @@ This package includes the common files f
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 # stuff moved, help upgrade path
+%if 0%{?fedora} && 0%{?fedora} < 12
 Conflicts: kdebase-runtime < 4.2.90
-Conflicts: kdebase-workspace-devel < 4.2.90
+%endif
+%if 0%{?fedora} && 0%{?fedora} < 13
+Conflicts: kdebase-workspace-devel < 4.3.80
+%endif
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdelibs4-devel < %{version}-%{release}
@@ -435,6 +443,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-6
+- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80
+
 * Sat Dec 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-5
 - move kdecmake,makekdewidgets manpages to -devel (#549947)