- up to 2.2.2 patched version

- added patch for disable qtscriptbindings check (from debian)
- updated kdever and qtver
- release 1

Changed files:
    amarok-disable_qtscriptbindings_check_fix.patch -> 1.1
    amarok.spec -> 1.215

diff --git a/amarok-disable_qtscriptbindings_check_fix.patch b/amarok-disable_qtscriptbindings_check_fix.patch
new file mode 100644 (file)
index 0000000..19d76c9
--- /dev/null
+++ b/amarok-disable_qtscriptbindings_check_fix.patch
@@ -0,0 +1,28 @@
+From: Modestas Vainius <modestas@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@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)

diff --git a/amarok.spec b/amarok.spec
index e26187a9bc4edc4d43854c4ecd361592dda8d7a6..47d64eb5853c48fd4b06119580ff050074027490 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,8 +2,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
@@ -12,10 +12,11 @@ Version:    2.2.2
 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}
@@ -127,6 +128,7 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %setup -q
 #%patch0 -p0
 #%patch1 -p0
+%patch2 -p1
 
 %build
 install -d build