* Thu May 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-5
- keep libphonon.so in %{_libdir} for non-KDE apps (#447831)
This commit is contained in:
parent
a83d931307
commit
634d5ca195
@ -120,8 +120,7 @@ diff -ur kdelibs-4.0.72/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.72-para
|
||||
+ 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 )
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.0.72
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
@ -246,6 +246,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"
|
||||
@ -345,6 +348,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
|
||||
@ -357,6 +361,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-5
|
||||
- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)
|
||||
|
||||
* Thu May 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-4
|
||||
- fix proxy support (#443931, kde#155707)
|
||||
- move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)
|
||||
|
Loading…
Reference in New Issue
Block a user