fix plugindir usage (#760039)

epel9
Rex Dieter 13 years ago
parent 0f92e4dc49
commit 962199dce1

@ -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})

@ -11,7 +11,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.5.57
Release: 3.%{snap}%{?dist}
Release: 4.%{snap}%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@ -24,7 +24,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
@ -178,6 +182,9 @@ rm -rf %{buildroot}
%changelog
* Wed Dec 07 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.57-4.20111031
- fix plugindir usage (#760039)
* Wed Nov 02 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.57-3.20111031
- fix release

Loading…
Cancel
Save