From 1e6c90aa61bb03cc2cd6e3c3decb847ee37b100e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Nov 12 2009 14:13:57 +0000
Subject: - amarok-2.2.1


---

diff --git a/.cvsignore b/.cvsignore
index e81d1cb..4d738f0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.2.0.tar.bz2
+amarok-2.2.1.tar.bz2
diff --git a/amarok.spec b/amarok.spec
index 5e33696..b2d9778 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.0
-Release: 3%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-# sigh, ride the lyric roller-coaster
-Patch100: lyric.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -32,6 +30,7 @@ BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
+BuildRequires: qca2-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
@@ -83,7 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .lyric
 
 
 %build
@@ -175,6 +173,9 @@ fi
 
 
 %changelog
+* Wed Nov 11 2009 Rex Dieter <rdieter@fedoraproject.org. 2.2.1-1
+- amarok-2.2.1
+
 * Thu Oct 08 2009 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-3
 - upstream lyric.patch
 
diff --git a/lyric.patch b/lyric.patch
deleted file mode 100644
index 2c129b2..0000000
--- a/lyric.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
-index 60150f9..5c75473 100644
---- a/src/scripts/lyrics_lyricwiki/main.js
-+++ b/src/scripts/lyrics_lyricwiki/main.js
-@@ -97,10 +97,26 @@ function onFinished( response )
-                 return;
-             }
-             // parse the relevant part of the html source of the returned page
--            relevant = /<div[^<>]*['"]lyricbox['"][^<>]*>(.*)<\/div>/.exec(response)[1];
-+            var pos = response.indexOf( "lyricbox" );
-+            var startPos = response.indexOf( ">", pos ) + 1;
-+            var endPos = response.indexOf( "</div>", startPos );
-+            var otherDivPos = response.indexOf( "<div", startPos );
-+            while ( otherDivPos != -1 && otherDivPos < endPos ) {
-+                endPos = response.indexOf( "</div>", endPos + 1 );
-+                otherDivPos = response.indexOf( "<div", otherDivPos + 1 );
-+            }
-+            var relevant = response.substring( startPos, endPos );
-             // take care of a few special cases
-             relevant = relevant.replace(/<br\s*\/?>/g, "\n") + "\n\n"; // convert <br> to \n
-             relevant = relevant.replace( /&mdash;/g, "—" ); // not supported by QDomDocument
-+            // strip adverts
-+            pos = relevant.indexOf( "rtMatcher" );
-+            while( pos != -1 ) {
-+                startPos = relevant.lastIndexOf( "<div", pos );
-+                endPos = relevant.indexOf( "</div>", pos );
-+                relevant = relevant.substring( 0, startPos ) + relevant.substring( endPos + 6 );
-+                pos = relevant.indexOf( "rtMatcher" );
-+            }
-             // construct a QDomDocument to convert special characters in the lyrics text. 
-             doc2 = new QDomDocument();
-             doc2.setContent( "<?xml version=\"1.0\" encoding=\"UTF-8\"?><lyrics>" + relevant + "</lyrics>" );
diff --git a/sources b/sources
index 83e500c..4ba33cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2
+4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2