[packages/cantata] - fix cmake so it actually uses what's passed in CANTATA_HELPERS_LIB_DIR - rel 3

[baggins]

commit 9b2ce9105384c807895aaa576164dcbe1b43becc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jan 11 07:38:02 2016 +0100

    - fix cmake so it actually uses what's passed in CANTATA_HELPERS_LIB_DIR
    - rel 3

 cantata.spec |  4 ++--
 libdir.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/cantata.spec b/cantata.spec
index 29baa15..6722673 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -7,7 +7,7 @@
 Summary:	Music Player Daemon (MPD) graphical client
 Name:		cantata
 Version:	1.5.2
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/Multimedia
 # https://github.com/CDrummond/cantata/wiki/Previous-%28Google-Code%29-Downloads
@@ -117,7 +117,7 @@ install -d build
 cd build
 CXXFLAGS="%{rpmcxxflags} -I/usr/include/qt5/QtSolutions"
 %cmake \
-	-DCANTATA_HELPERS_LIB_DIR=%{_libdir} \
+	-DCANTATA_HELPERS_LIB_DIR=%{_lib} \
 	-DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5 \
 	-DLCONVERT_EXECUTABLE=/usr/bin/lconvert-qt5 \
 	-DENABLE_KDE:BOOL=%{?with_kde:ON}%{!?with_kde:OFF} \
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 0000000..d94a8f2
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,11 @@
+--- cantata-1.5.2/CMakeLists.txt~	2016-01-10 10:31:27.000000000 +0100
++++ cantata-1.5.2/CMakeLists.txt	2016-01-11 07:35:12.310535875 +0100
+@@ -139,7 +139,7 @@
+ endif (NOT CMAKE_BUILD_TYPE)
+ 
+ if (NOT APPLE AND NOT WIN32)
+-    if (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
++    if (CANTATA_HELPERS_LIB_DIR)
+         set(LINUX_LIB_DIR ${CANTATA_HELPERS_LIB_DIR})
+     else (CANTATA_HELPERS_LIB_DIR AND NOT ENABLE_KDE AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+         set(LINUX_LIB_DIR lib)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cantata.git/commitdiff/9b2ce9105384c807895aaa576164dcbe1b43becc