From 985f9584b6355a56dd916b000a7b3251d65a2515 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 11 Nov 2013 10:18:05 -0600 Subject: [PATCH] workaround rootDir bogosity --- phonon-4.7.0-rootDir.patch | 12 ++++++++++++ phonon.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 phonon-4.7.0-rootDir.patch diff --git a/phonon-4.7.0-rootDir.patch b/phonon-4.7.0-rootDir.patch new file mode 100644 index 0000000..ee8eb6d --- /dev/null +++ b/phonon-4.7.0-rootDir.patch @@ -0,0 +1,12 @@ +diff -up phonon-4.7.0/PhononConfig.cmake.in.rootDir phonon-4.7.0/PhononConfig.cmake.in +--- phonon-4.7.0/PhononConfig.cmake.in.rootDir 2013-11-11 10:15:33.835839769 -0600 ++++ phonon-4.7.0/PhononConfig.cmake.in 2013-11-11 10:16:55.063365497 -0600 +@@ -4,7 +4,7 @@ + set(PHONON_VERSION "@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@") + + get_filename_component(currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am +-get_filename_component(rootDir ${currentDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix ++get_filename_component(rootDir @CMAKE_INSTALL_PREFIX@ ABSOLUTE) # get the chosen install prefix + + set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) + set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@) diff --git a/phonon.spec b/phonon.spec index 261de31..c8bea8c 100644 --- a/phonon.spec +++ b/phonon.spec @@ -11,7 +11,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.7.0 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: http://phonon.kde.org/ %if 0%{?snap} @@ -21,6 +21,7 @@ Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar. %endif Patch0: phonon-4.7.0-really-fix-rpath-handling.patch +Patch1: phonon-4.7.0-rootDir.patch ## upstream patches Patch0003: 0003-fix-rpath-handling.patch Patch0004: 0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch @@ -89,6 +90,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %patch0003 -p1 -b .0003 %patch0004 -p1 -b .0004 %patch0 -p1 -b .fix-rpath +%patch1 -p1 -b .rootDir %build @@ -195,6 +197,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}" %changelog +* Mon Nov 11 2013 Rex Dieter 4.7.0-7 +- workaround rootDir bogosity + * Mon Nov 11 2013 Rex Dieter 4.7.0-6 - Ensure-the-PulseAudio-envrionment-is-set-up (kde#327279)