rpms/kdelibs/F-9 kdelibs-4.0.4-parallel_devel.patch, 1.1, 1.2 kdelibs.spec, 1.318, 1.319

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28980/F-9

Modified Files:
	kdelibs-4.0.4-parallel_devel.patch kdelibs.spec 
Log Message:
* Fri May 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.4-8
- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)

kdelibs-4.0.4-parallel_devel.patch:

Index: kdelibs-4.0.4-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.0.4-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.4-parallel_devel.patch	6 May 2008 14:39:50 -0000	1.1
+++ kdelibs-4.0.4-parallel_devel.patch	23 May 2008 00:54:25 -0000	1.2
@@ -199,8 +199,7 @@
 +   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 )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- kdelibs.spec	23 May 2008 00:45:20 -0000	1.318
+++ kdelibs.spec	23 May 2008 00:54:25 -0000	1.319
@@ -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 @@
   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 @@
 %{_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 @@
 
 
 %changelog
+* Fri May 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.4-8
+- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)
+
 * Fri May 23 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-7
 - fix #447840: Konquerorsu crash in KDE 4