diff --git a/kdelibs.spec b/kdelibs.spec index 39d54f1..520de55 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -25,7 +25,7 @@ Summary: KDE Libraries Version: 4.8.97 -Release: 6%{?dist} +Release: 7%{?dist} Name: kdelibs Epoch: 6 @@ -404,8 +404,7 @@ do case "$i" in libkdeinit4_*.so) ;; - # conflicts with kdelibs3 - libkdecore.so|libkdefakes.so|libkdesu.so|libkdeui.so|libkhtml.so|libkimproxy.so|libkio.so|libkjs.so|libkmediaplayer.so|libkntlm.so|libkparts.so|libktexteditor.so|libkunittest.so|libkutils.so) + *) linktarget=`readlink "$i"` rm -f "$i" ln -sf "../../$linktarget" "kde4/devel/$i" @@ -594,8 +593,11 @@ rm -rf %{buildroot} %changelog +* Sun Jul 22 2012 Kevin Kofler - 6:4.8.97-7 +- revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142) + * Sat Jul 21 2012 Rex Dieter - 6:4.8.97-6 -- -devel: move only conflicting lib symlinks to kde4/devel +- -devel: move only conflicting lib symlinks to kde4/devel - drop old Conflicts/Obsoletes * Wed Jul 18 2012 Lukas Tinkl - 6:4.8.97-5