rpms/amarok/F-11 amarok-2.2.2-no_var_tracking.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 amarok.spec, 1.159, 1.160 sources, 1.50, 1.51

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32050

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.2.2-no_var_tracking.patch 
Log Message:
* Wed Jan 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.2.2-1
- amarok-2.2.2


amarok-2.2.2-no_var_tracking.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE amarok-2.2.2-no_var_tracking.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	21 Dec 2009 14:35:01 -0000	1.48
+++ .cvsignore	7 Jan 2010 00:38:32 -0000	1.49
@@ -1 +1 @@
-amarok-2.2.1.90.tar.bz2
+amarok-2.2.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- amarok.spec	21 Dec 2009 14:35:01 -0000	1.159
+++ amarok.spec	7 Jan 2010 00:38:32 -0000	1.160
@@ -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,9 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q 
 
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%patch1 -p1 -b .no_var_tracking
+%endif
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -173,6 +178,9 @@ fi
 
 
 %changelog
+* Wed Jan 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.2.2-1
+- amarok-2.2.2
+
 * Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
 - amarok-2.2.1.90 (2.2.2 beta1)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	21 Dec 2009 14:35:02 -0000	1.50
+++ sources	7 Jan 2010 00:38:32 -0000	1.51
@@ -1 +1 @@
-0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2
+c2c4ae2f2ff7154a064b554cdee557a9  amarok-2.2.2.tar.bz2