[rpms/amarok] epel10.2: merge/sync w/F-13 branch

[rpms/amarok] epel10.2: merge/sync w/F-13 branch

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 4fcaa26772f0c4f87f87153035a4927e72442f93
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-03-22T15:37:34+00:00
Stats  : +4/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/4fcaa26772f0c4f87f87153035a4927e72442f93?branch=epel10.2

Log:
merge/sync w/F-13 branch

---
diff --git a/amarok.spec b/amarok.spec
index e94375f..407c926 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -16,6 +16,8 @@ Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 # http://bugs.kde.org/227639
 # http://bugs.kde.org/229756
 Patch100: http://gitorious.org/amarok/amarok/commit/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
+# may need to rebase this, for building with qt-4.7
+# http://gitorious.org/amarok/amarok/commit/aa5ca5d179d084e99c8a477084ba717c35aa5030
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -88,7 +90,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %patch100 -p1 -b .info_applet_workaround 
 
 
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -186,8 +187,8 @@ fi
 - fix Source0 URL
 - -libs: drop unused/extraneous kdelibs4 dep
 
-* Wed Mar 10 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0-1
-- amarok-2.3.0
+* Thu Mar 11 2010 Thomas Janssen thomasj@fedoraproject.org> 2.3.0-1
+- amarok 2.3.0
 
 * Sat Feb 13 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.2.2.90-1
 - amarok-2.2.2.90 (2.3beta1)