From 23897b390c8ce99e9557292ca1eb0cbed395c208 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 20 Dec 2012 21:12:50 -0600 Subject: [PATCH] Conflicts: kdelibs3 < 3.5.10-42 --- kdelibs.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 4218b7f..4cdadd8 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -23,7 +23,7 @@ Summary: KDE Libraries Version: 4.9.95 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -153,8 +153,8 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch # rhel patches Patch300: kdelibs-4.8.3-webkit.patch -# kmailservice moved here -Conflicts: kdelibs3 < 3.5.10-38 +# kmailservice/ktelnetservice moved here +Conflicts: kdelibs3 < 3.5.10-42 BuildRequires: qt4-devel >= %{qt4_ver} %if 0%{?fedora} @@ -555,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Dec 20 2012 Rex Dieter 6:4.9.95-2 +- Conflicts: kdelibs3 < 3.5.10-42 + * Wed Dec 19 2012 Rex Dieter - 6:4.9.95-1 - 4.9.95