From 4d786f503bc97acbe89fc2d0ed6d9ece79508623 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 13 2009 17:20:50 +0000
Subject: - fix wikipedia access


---

diff --git a/amarok-1.4.10-wikipedia.patch b/amarok-1.4.10-wikipedia.patch
new file mode 100644
index 0000000..9880145
--- /dev/null
+++ b/amarok-1.4.10-wikipedia.patch
@@ -0,0 +1,12 @@
+diff -up amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia amarok-1.4.10/amarok/src/contextbrowser.cpp
+--- amarok-1.4.10/amarok/src/contextbrowser.cpp.wikipedia	2008-08-13 16:21:51.000000000 -0500
++++ amarok-1.4.10/amarok/src/contextbrowser.cpp	2009-04-13 12:09:53.000000000 -0500
+@@ -4189,7 +4189,7 @@ ContextBrowser::wikiResult( KIO::Job* jo
+     }
+ 
+     // Ok lets remove the top and bottom parts of the page
+-    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
++    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\">" ) );
+     m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
+     // Adding back license information
+     m_wiki += copyright;
diff --git a/amarok.spec b/amarok.spec
index 9bcea70..0223493 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -31,7 +31,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -46,6 +46,8 @@ Patch2:     amarok-1.4.7-xdg.patch
 ## upstream patches
 # security backport: http://websvn.kde.org/?view=rev&revision=908415
 Patch100:   amarok-1.4.10-aa_security.patch
+# fix wikipedia, see also https://bugs.edge.launchpad.net/ubuntu/+source/amarok/+bug/316140
+Patch101:   amarok-1.4.10-wikipedia.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -53,6 +55,8 @@ BuildRequires:  esound-devel
 BuildRequires:  gettext
 %{?_with_helix:BuildRequires:  HelixPlayer}
 BuildRequires:  kdelibs%{?kde3}-devel
+# workaround missing dep on rhel5
+BuildRequires:  libutempter-devel
 %if 0%{?konq}
 BuildRequires:  kdebase%{?kde3}-devel
 %else
@@ -148,6 +152,7 @@ use any of xmms' visualisation plugins with Amarok.
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 %patch100 -p4 -b .aa_security
+%patch101 -p1 -b .wikipedia
 
 
 %build
@@ -309,6 +314,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.4.10-3
+- fix wikipedia access
+
 * Mon Jan 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.4.10-2
 - backport security patch