[rpms/amarok] epel10.2: - amarok-2.1.85 (2.2beta2)

[rpms/amarok] epel10.2: - amarok-2.1.85 (2.2beta2)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : a93417f2b2c1eb1640920d51b8292697d97dc617
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2009-09-14T20:38:52+00:00
Stats  : +7/-20 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/a93417f2b2c1eb1640920d51b8292697d97dc617?branch=epel10.2

Log:
- amarok-2.1.85 (2.2beta2)

---
diff --git a/.cvsignore b/.cvsignore
index 32f3d03..b34611e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.1.80.tar.bz2
+amarok-2.1.85.tar.bz2

diff --git a/amarok-2.1.80-lyricwiki.patch b/amarok-2.1.80-lyricwiki.patch
deleted file mode 100644
index 5b653ca..0000000
--- a/amarok-2.1.80-lyricwiki.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js.lyricwiki amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js
---- amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js.lyricwiki	2009-09-01 12:19:32.000000000 -0500
-+++ amarok-2.1.80/src/scripts/lyrics_lyricwiki/main.js	2009-09-02 12:13:15.658840532 -0500
-@@ -68,7 +68,7 @@ function onFinished( dat )
-             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
-             Amarok.debug( "returned real lyricwiki URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
-             var url = doc.elementsByTagName( "url" ).at( 0 ).toElement().text();
--            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
-+            url = url.replace( /lyricwiki\.org\//, "lyrics.wikia.com/index.php?action=edit&title=" );
-             var url2 = QUrl.fromEncoded( new QByteArray( url ), 1 );
-             Amarok.debug( "request-2 URL: " + url2.toString() );
-             new Downloader( url2, onFinished2 );

diff --git a/amarok.spec b/amarok.spec
index 301d053..e4115dc 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.80
-Release: 2%{?dist}
+Version: 2.1.85
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -79,8 +78,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .lyricwiki
-
 
 %build
 mkdir -p %{_target_platform}
@@ -143,7 +140,6 @@ fi
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
@@ -172,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter@fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
 * Wed Sep 02 2009 Rex Dieter <rdieter@fedoraproject.org> 2.1.80-2
 - another lyricwiki fix
 

diff --git a/sources b/sources
index 9d9f2c8..7780877 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2
+38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2