- fix broker, relative paths in cmakefiles

- rel 4

diff --git a/cmake-dirs.patch b/cmake-dirs.patch
new file mode 100644 (file)
index 0000000..db89e3f
--- /dev/null
+++ b/cmake-dirs.patch
@@ -0,0 +1,19 @@
+--- phonon-4.8.3/cmake/FindPhononInternal.cmake.orig   2014-12-04 10:30:26.000000000 +0100
++++ phonon-4.8.3/cmake/FindPhononInternal.cmake        2015-04-04 14:40:09.316552962 +0200
+@@ -171,12 +171,12 @@
+ 
+ include(GNUInstallDirs)
+ 
+-set(SHARE_INSTALL_PREFIX        "share")  #              CACHE PATH "Base directory for files which go to share/")
+-set(INCLUDE_INSTALL_DIR         "include" ) #           CACHE PATH "The subdirectory to the header prefix")
++set(SHARE_INSTALL_PREFIX        "${CMAKE_INSTALL_DATADIR}" )  #              CACHE PATH "Base directory for files which go to share/")
++set(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_INCLUDEDIR}" ) #           CACHE PATH "The subdirectory to the header prefix")
+ if (PHONON_BUILD_PHONON4QT5)
+-    set(INCLUDE_INSTALL_DIR         "include/${PHONON_LIB_SONAME}" ) #           CACHE PATH "The subdirectory to the header prefix")
++      set(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_INCLUDEDIR}/${PHONON_LIB_SONAME}" ) #           CACHE PATH "The subdirectory to the header prefix")
+ endif (PHONON_BUILD_PHONON4QT5)
+-set(BIN_INSTALL_DIR             "bin"     ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
++set(BIN_INSTALL_DIR             "${CMAKE_INSTALL_BINDIR}" ) #         CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
+ set(LIB_INSTALL_DIR             "${CMAKE_INSTALL_LIBDIR}" ) #  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
+ set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
+ if (PHONON_BUILD_PHONON4QT5)

diff --git a/phonon.spec b/phonon.spec
index fa0c00c961f87fac12122371ed307894e5ba1ee0..d7b0a685fa7cf975886a1efd01fbb103614b81ff 100644 (file)
--- a/phonon.spec
+++ b/phonon.spec
@@ -10,12 +10,13 @@ Summary:    Phonon: multimedia API for Qt4/KDE4
 Summary(pl.UTF-8):     Phonon - biblioteka multimedialna dla Qt4/KDE4
 Name:          phonon
 Version:       4.8.3
-Release:       3
+Release:       4
 License:       LGPL v2.1 or LGPL v3
 Group:         X11/Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/%{name}-%{version}.tar.xz
 # Source0-md5: 88bb9867261803eed61ff53a7c026338
 Patch0:                %{name}-pkg.patch
+Patch1:                cmake-dirs.patch
 URL:           http://phonon.kde.org/
 %if %{with qt5}
 BuildRequires: Qt5Core-devel >= %{qt5_ver}
@@ -182,7 +183,7 @@ Wtyczka Phonon dla Qt5 QtDesignera.
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
 
 %build
 install -d build