revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142)

* Sun Jul 22 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:4.8.97-7
- revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142)
This commit is contained in:
Kevin Kofler 2012-07-22 16:51:05 +02:00
parent 5fe6a05357
commit ff2adf8187
1 changed files with 6 additions and 4 deletions

View File

@ -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 <Kevin@tigcc.ticalc.org> - 6:4.8.97-7
- revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142)
* Sat Jul 21 2012 Rex Dieter <rdieter@fedoraproject.org> - 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 <ltinkl@redhat.com> - 6:4.8.97-5