rpms/amarok/devel amarok-2.1.80-lyricwiki.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 amarok.spec, 1.160, 1.161 sources, 1.49, 1.50 amarok-parse-lyricwiki-website.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16455

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.1.80-lyricwiki.patch 
Removed Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
- another lyricwiki fix

* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
- amarok-2.1.80 (2.2beta1)
- -libs subpkg


amarok-2.1.80-lyricwiki.patch:
 main.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amarok-2.1.80-lyricwiki.patch ---
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 );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	13 Jun 2009 18:43:25 -0000	1.48
+++ .cvsignore	2 Sep 2009 17:21:05 -0000	1.49
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.1.80.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- amarok.spec	21 Aug 2009 12:23:00 -0000	1.160
+++ amarok.spec	2 Sep 2009 17:21:05 -0000	1.161
@@ -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 %{_
 
 %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}/
 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 at fedoraproject.org> 2.1.80-2
+- another lyricwiki fix
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	13 Jun 2009 18:43:25 -0000	1.49
+++ sources	2 Sep 2009 17:21:05 -0000	1.50
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2


--- amarok-parse-lyricwiki-website.patch DELETED ---