From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 21 Oct 2010 12:56:48 +0000 (+0000)
Subject: - needs qt 4.5 (at least) for lconvert tool
X-Git-Tag: auto/th/clementine-0_5_3-3~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=64d9867eab9fa5ada4e68676194b1a408aea0679;p=packages%2Fclementine.git

- needs qt 4.5 (at least) for lconvert tool

Changed files:
    clementine.spec -> 1.25
    qt-ver.patch -> 1.1
---

diff --git a/clementine.spec b/clementine.spec
index 4366d9b..745c61e 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -15,6 +15,7 @@
 %bcond_without	static_sqlite	# with static sqlite3
 %bcond_with		static_projectm	# with static projectM
 
+%define		qtver	4.5
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
@@ -28,16 +29,17 @@ Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:		desktop-install.patch
 Patch1:		unbundle-po.patch
 Patch2:		build-languages-dynamic.patch
-BuildRequires:	QtCore-devel
-BuildRequires:	QtDBus-devel
-BuildRequires:	QtGui-devel
+Patch3:		qt-ver.patch
+BuildRequires:	QtCore-devel >= %{qtver}
+BuildRequires:	QtDBus-devel >= %{qtver}
+BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	QtIOCompressor-devel
-BuildRequires:	QtNetwork-devel
-BuildRequires:	QtOpenGL-devel
+BuildRequires:	QtNetwork-devel >= %{qtver}
+BuildRequires:	QtOpenGL-devel >= %{qtver}
 BuildRequires:	QtSingleApplication-devel >= 2.6-4
-BuildRequires:	QtSql-devel
-%{?with_tests:BuildRequires:	QtTest-devel}
-BuildRequires:	QtXml-devel
+BuildRequires:	QtSql-devel >= %{qtver}
+%{?with_tests:BuildRequires:	QtTest-devel >= %{qtver}}
+BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6
 #BuildRequires:	desktop-file-utils
@@ -62,7 +64,7 @@ BuildRequires:	notification-daemon
 BuildRequires:	phonon
 %{?with_engine_phonon:BuildRequires:	phonon-devel}
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-build
+BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-linguist
 BuildRequires:	qt4-qmake
 BuildRequires:	rpmbuild(find_lang) = 1.33
@@ -75,7 +77,7 @@ BuildRequires:	usbmuxd-devel
 %{?with_engine_xine:BuildRequires:	xine-lib-devel}
 Requires(post,postun):	desktop-file-utils
 Requires:	QtSingleApplication >= 2.6-4
-%{!?with_static_sqlite:Requires:	QtSql-sqlite3}
+%{!?with_static_sqlite:Requires:	QtSql-sqlite3 >= %{qtver}}
 # while we do not link (yet), we use datafiles
 Requires:	libprojectM
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -98,6 +100,7 @@ a Qt4 előnyeit.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # We already don't use these but just to make sure
 rm -rf 3rdparty/gmock
diff --git a/qt-ver.patch b/qt-ver.patch
new file mode 100644
index 0000000..d506fc7
--- /dev/null
+++ b/qt-ver.patch
@@ -0,0 +1,12 @@
+--- clementine-0.5.3/CMakeLists.txt~	2010-10-19 14:26:26.098273180 +0300
++++ clementine-0.5.3/CMakeLists.txt	2010-10-21 15:46:12.957182252 +0300
+@@ -7,7 +7,8 @@
+ include(cmake/Deb.cmake)
+ include(cmake/Rpm.cmake)
+ 
+-find_package(Qt4 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
++find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
++
+ if(UNIX AND NOT APPLE)
+   find_package(Qt4 REQUIRED QtDbus)
+ endif(UNIX AND NOT APPLE)