packages: clementine/clementine.spec, clementine/qt-ver.patch (NEW) - needs...

[glen]

Author: glen                         Date: Thu Oct 21 12:56:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- needs qt 4.5 (at least) for lconvert tool

---- Files affected:
packages/clementine:
   clementine.spec (1.24 -> 1.25) , qt-ver.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.24 packages/clementine/clementine.spec:1.25
--- packages/clementine/clementine.spec:1.24	Wed Oct 20 13:01:52 2010
+++ packages/clementine/clementine.spec	Thu Oct 21 14:56:48 2010
@@ -16,6 +16,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
@@ -29,16 +30,17 @@
 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
@@ -63,7 +65,7 @@
 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
@@ -76,7 +78,7 @@
 %{?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)
@@ -99,6 +101,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # We already don't use these but just to make sure
 rm -rf 3rdparty/gmock
@@ -159,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/10/21 12:56:48  glen
+- needs qt 4.5 (at least) for lconvert tool
+
 Revision 1.24  2010/10/20 11:01:52  glen
 - unbundle translations, tag with %lang
 

================================================================
Index: packages/clementine/qt-ver.patch
diff -u /dev/null packages/clementine/qt-ver.patch:1.1
--- /dev/null	Thu Oct 21 14:56:53 2010
+++ packages/clementine/qt-ver.patch	Thu Oct 21 14:56:48 2010
@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.24&r2=1.25&f=u