diff --git a/kdelibs-4.0.4-parallel_devel.patch b/kdelibs-4.0.4-parallel_devel.patch index 3ac079f..c62ea07 100644 --- a/kdelibs-4.0.4-parallel_devel.patch +++ b/kdelibs-4.0.4-parallel_devel.patch @@ -199,8 +199,7 @@ diff -up kdelibs-4.0.4/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdeli + find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) -- find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) + find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} ) - find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) diff --git a/kdelibs.spec b/kdelibs.spec index d85039f..5dd9521 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.4 -Release: 7%{?dist} +Release: 8%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -258,6 +258,9 @@ do case "$i" in libkdeinit4_*.so) ;; + # don't move Phonon, non-KDE apps want to use it + libphonon.so) + ;; *) linktarget=`readlink "$i"` rm -f "$i" @@ -355,6 +358,7 @@ rm -rf %{buildroot} %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ %{_kde4_includedir}/* +%{_kde4_libdir}/libphonon.so %{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/kde4/plugins/designer/ %endif @@ -367,6 +371,9 @@ rm -rf %{buildroot} %changelog +* Fri May 23 2008 Kevin Kofler - 4.0.4-8 +- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) + * Fri May 23 2008 Lukáš Tinkl - 4.0.4-7 - fix #447840: Konquerorsu crash in KDE 4