rpms/kdelibs/devel kdelibs-4.0.72-parallel_devel.patch, 1.2, 1.3 kdelibs.spec, 1.319, 1.320

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12739/devel

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

kdelibs-4.0.72-parallel_devel.patch:

Index: kdelibs-4.0.72-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.0.72-parallel_devel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.0.72-parallel_devel.patch	2 May 2008 01:09:22 -0000	1.2
+++ kdelibs-4.0.72-parallel_devel.patch	22 May 2008 12:24:30 -0000	1.3
@@ -120,8 +120,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/devel/kdelibs.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- kdelibs.spec	15 May 2008 02:43:03 -0000	1.319
+++ kdelibs.spec	22 May 2008 12:24:30 -0000	1.320
@@ -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 @@
   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 @@
 %{_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 @@
 
 
 %changelog
+* Thu May 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-5
+- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)
+
 * Thu May 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-4
 - fix proxy support (#443931, kde#155707)
 - move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)