diff --git a/kdelibs.spec b/kdelibs.spec index 573e0d0..4aecf29 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -21,7 +21,7 @@ Summary: K Desktop Environment - Libraries Version: 3.5.7 -Release: 21%{?dist} +Release: 22%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -164,7 +164,6 @@ kimgio (image manipulation). %package devel Group: Development/Libraries Summary: Header files and documentation for compiling KDE applications. -Conflicts: kdelibs4-devel %if "%{name}" == "kdelibs" Obsoletes: kdelibs3-devel < %{version}-%{release} Provides: kdelibs3-devel = %{version}-%{release} @@ -522,6 +521,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Sat Sep 09 2007 Kevin Kofler 6:3.5.7-22 +- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict + (allows using the old /opt/kde4 versions for now) + * Wed Aug 22 2007 Rex Dieter 6:3.5.7-21 - vcard30 patch (kde#115219,rh#253496) - -devel: restore awol Requires (< f8 only) (#253801)