[phonon/f15] fix plugindir usage (#760039)

[Rex Dieter]

commit 4d1d2ce117de4bfe704a0a945bb8481cb803c873
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 7 13:02:19 2011 -0600

    fix plugindir usage (#760039)

 phonon-4.5.57-plugindir.patch |   12 ++++++++++++
 phonon.spec                   |   11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/phonon-4.5.57-plugindir.patch b/phonon-4.5.57-plugindir.patch
new file mode 100644
index 0000000..d1af9a8
--- /dev/null
+++ b/phonon-4.5.57-plugindir.patch
@@ -0,0 +1,12 @@
+diff -up phonon-4.5.57/phonon/CMakeLists.txt.plugindir phonon-4.5.57/phonon/CMakeLists.txt
+--- phonon-4.5.57/phonon/CMakeLists.txt.plugindir	2011-10-21 08:54:42.000000000 -0500
++++ phonon-4.5.57/phonon/CMakeLists.txt	2011-12-07 12:18:01.148682382 -0600
+@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
+     add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
+ endif (PHONON_NO_PLATFORMPLUGIN)
+ 
+-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
+ 
+ automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
+ target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
diff --git a/phonon.spec b/phonon.spec
index 39fd6ef..45f6bdf 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -9,7 +9,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -22,7 +22,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: phonon-4.4.4-no_rpath.patch
 
-## Ubuntu/upstreamable patches
+## upstreamable patches
+# phonon_backend ... could not be loaded
+# http://bugzilla.redhat.com/760039
+Patch50: phonon-4.5.57-plugindir.patch 
 
 ## Upstream patches
 
@@ -92,6 +95,7 @@ Includes experimental and unstable apis.
 %setup -q 
 
 %patch1 -p1 -b .no_rpath
+%patch50 -p1 -b .plugindir
 
 
 %build
@@ -175,6 +179,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.1-2
+- fix plugindir usage (#760039)
+
 * Thu Oct 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.1-1
 - phonon-4.5.1
 - pkgconfig-style deps