packages: amarok/amarok.spec, amarok/amarok-disable_qtscriptbindings_check_...

[arvenil]

Author: arvenil                      Date: Sat Mar 13 17:37:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.2 patched version
- added patch for disable qtscriptbindings check (from debian)
- updated kdever and qtver
- release 1

---- Files affected:
packages/amarok:
   amarok.spec (1.214 -> 1.215) , amarok-disable_qtscriptbindings_check_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.214 packages/amarok/amarok.spec:1.215
--- packages/amarok/amarok.spec:1.214	Sat Feb  6 02:56:37 2010
+++ packages/amarok/amarok.spec	Sat Mar 13 18:37:28 2010
@@ -3,8 +3,8 @@
 # - try not to link with static mysql
 
 %define		state	stable
-%define		qtver	4.5.3
-%define		kdever	4.3.3
+%define		qtver	4.6.2
+%define		kdever	4.4.1
 
 Summary:	A KDE audio player
 Summary(pl.UTF-8):	Odtwarzacz audio dla KDE
@@ -13,10 +13,11 @@
 Release:	1
 License:	GPL
 Group:		X11/Applications/Multimedia
-Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	c2c4ae2f2ff7154a064b554cdee557a9
+Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}-patched.tar.bz2
+# Source0-md5:	9b4453597e4affb1a6bebe715499782f
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-qthreadpool.patch
+Patch2:		%{name}-disable_qtscriptbindings_check_fix.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
@@ -128,6 +129,7 @@
 %setup -q
 #%patch0 -p0
 #%patch1 -p0
+%patch2 -p1
 
 %build
 install -d build
@@ -303,6 +305,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.215  2010/03/13 17:37:28  arvenil
+- up to 2.2.2 patched version
+- added patch for disable qtscriptbindings check (from debian)
+- updated kdever and qtver
+- release 1
+
 Revision 1.214  2010/02/06 01:56:37  sparky
 - commented out unused BRs: QtDesigner-devel, QtTest-devel, giflib-devel,
   libifp-devel, libnjb-devel, libvisual-devel, mpeg4ip-devel, rpm-pythonprov,

================================================================
Index: packages/amarok/amarok-disable_qtscriptbindings_check_fix.patch
diff -u /dev/null packages/amarok/amarok-disable_qtscriptbindings_check_fix.patch:1.1
--- /dev/null	Sat Mar 13 18:37:33 2010
+++ packages/amarok/amarok-disable_qtscriptbindings_check_fix.patch	Sat Mar 13 18:37:28 2010
@@ -0,0 +1,28 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: [PATCH] Disable QtScriptBindings check
+
+QtScriptBindings is a runtime dependency which is not
+needed at build time. Disable cmake check.
+
+Signed-off-by: Modestas Vainius <modestas at vainius.eu>
+
+---
+ CMakeLists.txt |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d830b2..e0dfdc0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,9 +38,6 @@ if( WITH_PLAYER )
+ 
+     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
+ 
+-    find_package( QtScriptQtBindings REQUIRED )
+-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+-
+     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+     find_package(MySQLAmarok REQUIRED)
+-- 
+tg: (d5becae..) debian/disable_qtscriptbindings_check_fix (depends on: upstream)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.214&r2=1.215&f=u