[rpms/amarok] epel10.2: - another lyricwiki fix

[Rex Dieter <rdieter@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 22b7c02a1bb7dea1089561d6998e7f79364b7571
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2009-09-02T17:21:05+00:00
            Stats  : +58/-72 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/22b7c02a1bb7dea1089561d6998e7f79364b7571?branch=epel10.2

            Log:
            - another lyricwiki fix
Wed Sep 02 2009 Rex Dieter <rdieter@fedoraproject.org> 2.1.80-1
- amarok-2.1.80 (2.2beta1)
- -libs subpkg

---
diff --git a/.cvsignore b/.cvsignore
index 6db83b2..32f3d03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.1.80.tar.bz2

diff --git a/amarok-2.1.80-lyricwiki.patch b/amarok-2.1.80-lyricwiki.patch
new file mode 100644
index 0000000..5b653ca
--- /dev/null
+++ b/amarok-2.1.80-lyricwiki.patch
@@ -0,0 +1,12 @@
+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-parse-lyricwiki-website.patch b/amarok-parse-lyricwiki-website.patch
deleted file mode 100644
index b3e8cac..0000000
--- a/amarok-parse-lyricwiki-website.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
-index bce329c..d2b9902 100644
---- a/src/scripts/lyrics_lyricwiki/main.js
-+++ b/src/scripts/lyrics_lyricwiki/main.js
-@@ -27,6 +27,31 @@ Importer.loadQtBinding( "qt.core" );
- Importer.loadQtBinding( "qt.xml" );
- 
- xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><lyric artist=\"{artist}\" title=\"{title}\">{lyrics}</lyric>";
-+newxml = "";
-+
-+function onFinished2( response )
-+{
-+    try
-+    {
-+        if( response.length == 0 )
-+            Amarok.Lyrics.showLyricsError( "Unable to contact server - no website returned" ); // TODO: this should be i18n able
-+        else
-+        {
-+            doc2 = new QDomDocument();
-+            doc2.setContent( response );
-+            textboxtext = doc2.elementsByTagName( "textarea" ).at( 0 ).toElement().text();
-+            lyr = /<lyrics>(.*)<\/lyrics>/.exec(textboxtext)[1];
-+            //Amarok.debug( "matched: " + lyr );
-+            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( lyr ) );
-+            Amarok.Lyrics.showLyrics( newxml );
-+        }
-+    }
-+    catch( err )
-+    {
-+        Amarok.Lyrics.showLyricsError( "Could not retrieve lyrics: " + err );
-+        Amarok.debug( "error: " + err );
-+    }
-+}
- 
- function onFinished( dat )
- {
-@@ -38,13 +63,14 @@ function onFinished( dat )
-         {
-             doc = new QDomDocument();
-             doc.setContent( dat );
--            parsedContent = doc.elementsByTagName( "lyrics" ).at( 0 ).toElement().text();
--            parsedContent = parsedContent.replace( "<lyrics>", "" ).replace( "</lyrics>", "" ); // some lyrics have 2 lyrics in them...wtf?
-             newxml = xml.replace( "{artist}", Amarok.Lyrics.escape( doc.elementsByTagName( "artist" ).at( 0 ).toElement().text() ) );
-             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
--            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( parsedContent ) );
--            //Amarok.debug( "showing lyrics:" + newxml );
--            Amarok.Lyrics.showLyrics( newxml );
-+            Amarok.debug( "returned URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
-+            var url = decodeURI(doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
-+            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
-+            var url2 = new QUrl(url);
-+            Amarok.debug( "request-2 URL: " + url2.toString() );
-+            new Downloader( url2, onFinished2 );
-         }
-     }
-     catch( err )

diff --git a/amarok.spec b/amarok.spec
index 2f6e90e..301d053 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,26 +1,26 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.1.80
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-parse-lyricwiki-website.patch
+Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
+BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -36,12 +36,15 @@ BuildRequires: taglib-devel
 BuildRequires: taglib-extras-devel
 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# when we grew a -libs subpkg, multilib love
+Obsoletes: amarok < 2.1.80
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -54,6 +57,14 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%description libs
+%{summary}.
+
 %package utils
 Summary: Amarok standalone utilities
 Group: Applications/Multimedia
@@ -67,6 +78,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q
 
 %patch50 -p1 -b .qtscript_not_required
+
 %patch100 -p1 -b .lyricwiki
 
 
@@ -86,10 +98,13 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang amarok
 %find_lang amarokcollectionscanner_qt
+%find_lang amarokpkg
+%find_lang amarok_scriptengine_qscript
+cat amarokpkg.lang >> amarok.lang
+cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
-rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -101,7 +116,6 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
@@ -109,26 +123,32 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarokpkg
 %{_kde4_bindir}/amarok_afttagger
 %{_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
 %{_kde4_configdir}/amarok_homerc
+%{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -137,18 +157,28 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libamarok*.so.*
-%{_kde4_libdir}/libmediadevicelib.so.*
-%{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libamaroklib.so.1*
+%{_kde4_libdir}/libamarokocsclient.so.4*
+%{_kde4_libdir}/libamarokpud.so.1*
+
 %files utils -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 
 
 %changelog
+* Wed Sep 02 2009 Rex Dieter <rdieter@fedoraproject.org> 2.1.80-2
+- another lyricwiki fix
+
+* Wed Sep 02 2009 Rex Dieter <rdieter@fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.1-5
 - rebuilt with new openssl
 

diff --git a/sources b/sources
index 14ffe0f..9d9f2c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2