From b700d470d157e1a8e8790b2310789453ae6da4a4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 27 Dec 2009 10:53:38 +0000 Subject: [PATCH] * Sun Dec 27 2009 Rex Dieter - 4.3.85-6 - Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80 --- kdelibs.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index ed9aab0..c236f14 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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_tracking_assignments.patch ## 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 for the KDE 3 and KDE 4 libraries. 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 - 4.3.85-6 +- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80 + * Sat Dec 26 2009 Rex Dieter - 4.3.85-5 - move kdecmake,makekdewidgets manpages to -devel (#549947)