[telepathy-qt] fix Qt version detection

[Rex Dieter]

commit 2611dfa3f98ab0712689983c3084fbab03d3994e
Author: Rex Dieter <rdieter at gmail.com>
Date:   Mon Feb 23 12:31:53 2015 -0600

    fix Qt version detection

 telepathy-qt.spec | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/telepathy-qt.spec b/telepathy-qt.spec
index 494d69e..e69cbee 100644
--- a/telepathy-qt.spec
+++ b/telepathy-qt.spec
@@ -130,14 +130,13 @@ Requires: telepathy-qt5%{?_isa} = %{version}-%{release}
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake} \
+%{cmake} .. \
   -DCMAKE_BUILD_TYPE:STRING=release \
-  -DQT_QMAKE_EXECUTABLE=%{_qt4_qmake} \
+  -DDESIRED_QT_VERSION=4 \
   -DDISABLE_WERROR:BOOL=ON \
   %{?enable_tests}%{!?enable_tests:-DENABLE_TESTS:BOOL=OFF} \
   %{?farstream:-DENABLE_FARSTREAM:BOOL=ON} \
-  %{!?farstream:-DENABLE_FARSTREAM:BOOL=OFF} \
-  ..
+  %{!?farstream:-DENABLE_FARSTREAM:BOOL=OFF}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -145,14 +144,13 @@ make %{?_smp_mflags} -C %{_target_platform}
 %if 0%{?qt5}
 mkdir %{_target_platform}-qt5
 pushd %{_target_platform}-qt5
-%{cmake} \
+%{cmake} .. \
   -DCMAKE_BUILD_TYPE:STRING=release \
-  -DQT_QMAKE_EXECUTABLE=%{_qt5_qmake} \
+  -DDESIRED_QT_VERSION=5 \
   -DDISABLE_WERROR:BOOL=ON \
   %{?enable_tests}%{!?enable_tests:-DENABLE_TESTS:BOOL=OFF} \
   %{?farstream:-DENABLE_FARSTREAM:BOOL=ON} \
-  %{!?farstream:-DENABLE_FARSTREAM:BOOL=OFF} \
-  ..
+  %{!?farstream:-DENABLE_FARSTREAM:BOOL=OFF}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}-qt5