[rpms/amarok] epel10: - amarok-2.2.2

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 256e788c2450019329cddece4f75b550c9553500
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-01-07T00:34:32+00:00
Stats  : +23/-4 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/256e788c2450019329cddece4f75b550c9553500?branch=epel10

Log:
- amarok-2.2.2

---
diff --git a/.cvsignore b/.cvsignore
index 6971e50..fada88c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.2.1.90.tar.bz2
+amarok-2.2.2.tar.bz2

diff --git a/amarok-2.2.2-no_var_tracking.patch b/amarok-2.2.2-no_var_tracking.patch
new file mode 100644
index 0000000..5b0c658
--- /dev/null
+++ b/amarok-2.2.2-no_var_tracking.patch
@@ -0,0 +1,12 @@
+diff -up amarok-2.2.2/src/CMakeLists.txt.no_var_tracking amarok-2.2.2/src/CMakeLists.txt
+--- amarok-2.2.2/src/CMakeLists.txt.no_var_tracking	2010-01-06 16:19:46.000000000 -0600
++++ amarok-2.2.2/src/CMakeLists.txt	2010-01-06 17:43:11.257848590 -0600
+@@ -714,6 +714,8 @@ set( amaroklib_DEPENDS "amarokpud" )
+ 
+ kde4_add_kcfg_files(amaroklib_LIB_SRCS amarokconfig.kcfgc)
+ 
++set_source_files_properties(amarokconfig.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
++
+ kde4_add_ui_files(amaroklib_LIB_SRCS
+     aboutdialog/OcsPersonItem.ui
+     dialogs/EditCoverSearchDialog.ui

diff --git a/amarok.spec b/amarok.spec
index 77d2774..413cf83 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,7 +1,7 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1.90
+Version: 2.2.2
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
@@ -10,6 +10,8 @@ Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: amarok-2.2.2-no_var_tracking.patch
+
 Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
@@ -81,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q 
 
+%patch1 -p1 -b .no_var_tracking
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -90,7 +93,8 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+#make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE= -C %{_target_platform}
 
 
 %install
@@ -173,6 +177,9 @@ fi
 
 
 %changelog
+* Wed Jan 05 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.2.2-1
+- amarok-2.2.2
+
 * Thu Dec 10 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.2.1.90-1
 - amarok-2.2.1.90 (2.2.2 beta1)
 

diff --git a/sources b/sources
index 95ee861..27ab552 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2
+c2c4ae2f2ff7154a064b554cdee557a9  amarok-2.2.2.tar.bz2