diff --git a/kdelibs.spec b/kdelibs.spec index 5b2aaa3..e7e52ed 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -16,7 +16,7 @@ Summary: KDE Libraries Version: 4.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -105,6 +105,14 @@ Patch300: kdelibs-4.5.90-halectomy.patch Conflicts: kdebase-workspace-libs < 4.3.80 %endif +# force upgrade of apps using the discontinued KatePart Smart* interfaces to +# versions using the new Moving* interfaces instead +Conflicts: kdevplatform < 1.1.80 +Conflicts: kdevelop < 9:4.1.80 +# 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported +Conflicts: kile < 2.1-0.9 +Conflicts: rkward < 0.5.4 + BuildRequires: qt4-devel >= %{qt4_ver} BuildRequires: qt4-webkit-devel %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -521,6 +529,10 @@ rm -rf %{buildroot} %changelog +* Tue Jan 25 2010 Kevin Kofler - 4.6.0-2 +- Conflicts with old versions of kdevplatform, kdevelop, kile, rkward to force + their upgrade to compatible versions + * Fri Jan 21 2011 Jaroslav Reznik - 4.6.0-1 - 4.6.0