[amarok] - amarok-2.3.1.90 (2.3.2 beta1)

[Rex Dieter]

commit edb219e7a06b060d5eacfd2d6da6d6de1852cccb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 16 09:57:29 2010 -0500

    - amarok-2.3.1.90 (2.3.2 beta1)

 .gitignore                                         |    2 +-
 0001-Move-some-code-in-TrayIcon-class.patch        |   85 -------
 0002-Some-TrayIcon-changes.patch                   |  251 -------------------
 ...-not-update-cover-each-time-we-update-the.patch |  258 --------------------
 ...e-redundant-debug-output.-Update-copyrigh.patch |   52 ----
 amarok-2.3.1-glib26_signals_fix.patch              |   14 -
 amarok.spec                                        |   29 +--
 sources                                            |    2 +-
 8 files changed, 15 insertions(+), 678 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ef5697..71ead51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-amarok-2.3.1.tar.bz2
+amarok-2.3.1.90.tar.bz2
diff --git a/amarok.spec b/amarok.spec
index c2a1286..62a83d0 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,23 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.3.1.90
+Release: 1%{?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.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.3.1-glib26_signals_fix.patch
-Patch101: 0001-Move-some-code-in-TrayIcon-class.patch
-Patch102: 0002-Some-TrayIcon-changes.patch
-patch103: 0003-TrayIcon-Do-not-update-cover-each-time-we-update-the.patch
-Patch104: 0004-Minor-Remove-redundant-debug-output.-Update-copyrigh.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -86,13 +81,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%if 0%{?fedora} > 13
-%patch100 -p1 -b .glib26_signals_fix
-%endif
-%patch101 -p1 -b .0001
-%patch102 -p1 -b .0002
-%patch103 -p1 -b .0003
-%patch104 -p1 -b .0004
 
 
 %build
@@ -109,7 +97,11 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok 
+# an initial handbook is available, but it is currently fubar
+# FIXME
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/amarok
+
+%find_lang amarok --with-kde
 %find_lang amarokcollectionscanner_qt 
 %find_lang amarokpkg 
 %find_lang amarok_scriptengine_qscript 
@@ -122,6 +114,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plas
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
 
 
 %clean
@@ -162,6 +155,7 @@ fi
 %{_kde4_configdir}/amarok_homerc
 %{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
+%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
@@ -186,6 +180,9 @@ fi
 
 
 %changelog
+* Mon Aug 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1.90-1
+- amarok-2.3.1.90 (2.3.2 beta1)
+
 * Fri Jul 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-2
 - No Notification Area icon for non-KDE desktops (kde#232578,rh#603336)
 
diff --git a/sources b/sources
index 696aedc..337a849 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6679adaf5cc757b1515a9f03cdcb6066  amarok-2.3.1.tar.bz2
+2b88de0f17b8edabfa4afcae4b1420c8  amarok-2.3.1.90.tar.bz2