[clementine] allow bundled gmock(1.5), not compat with 1.6

[Rex Dieter]

commit a9376fc675cc53e22f5567b279bd28245a9be955
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 10:40:19 2013 -0500

    allow bundled gmock(1.5), not compat with 1.6
    
    f20+'s gmock-1.6 currently makes clementine FTBFS, since it no
    longer provides a library.

 clementine.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/clementine.spec b/clementine.spec
index ca33348..c0bc8e8 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -22,7 +22,10 @@ BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  fftw-devel
 BuildRequires:  gettext
+BuildConflicts: gmock-devel >= 1.6
+%if 0%{?fedora} && 0%{?fedora} < 20
 BuildRequires:  gmock-devel
+%endif
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gtest-devel
@@ -71,9 +74,9 @@ music.
 
 # Remove all 3rdparty libraries exceph universalchardet
 # as it is not available as a separate library.
-mv 3rdparty/{qocoa,universalchardet}/ .
+mv 3rdparty/{gmock,qocoa,universalchardet}/ .
 rm -fr 3rdparty/*
-mv {qocoa,universalchardet}/ 3rdparty/
+mv {gmock,qocoa,universalchardet}/ 3rdparty/
 
 # Can't run all the unit tests
 #   songloader requires internet connection
@@ -146,6 +149,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - clementine - excessive debug output (#1001595)
 - drop Requires: libtaginfo (not needed or used afaict)
 - drop Requires: libprojectM, qtsingleapplication
+- allow bundled gmock(1.5), not compat with 1.6 (yet)
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild