rpms/banshee/F-10 banshee-1.4.3-coverart_query.patch, NONE, 1.1 banshee-1.4.3-podcast_download.patch, NONE, 1.1 banshee.spec, 1.68, 1.69

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/banshee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24646

Modified Files:
	banshee.spec 
Added Files:
	banshee-1.4.3-coverart_query.patch 
	banshee-1.4.3-podcast_download.patch 
Log Message:
apply patches for fixes covered in F-11, rawhide

banshee-1.4.3-coverart_query.patch:

--- NEW FILE banshee-1.4.3-coverart_query.patch ---
# https://bugzilla.redhat.com/show_bug.cgi?id=492707
Index: src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
===================================================================
--- src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(revision 4857)
+++ src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(working copy)
@@ -58,10 +58,12 @@
 
         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
             SELECT count(DISTINCT CoreTracks.AlbumID)
-            FROM CoreTracks
+            FROM CoreTracks, CoreArtists, CoreAlbums
             WHERE
                 CoreTracks.PrimarySourceID = ? AND
                 CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                 CoreTracks.AlbumID NOT IN (
                     SELECT AlbumID FROM CoverArtDownloads WHERE
                         LastAttempt > ? OR Downloaded = 1)");

banshee-1.4.3-podcast_download.patch:

--- NEW FILE banshee-1.4.3-podcast_download.patch ---
# http://bugzilla.gnome.org/show_bug.cgi?id=536047
Index: src/Libraries/Migo/Migo.Net/AsyncWebClient.cs
===================================================================
--- src/Libraries/Migo/Migo.Net/AsyncWebClient.cs	(revision 5091)
+++ src/Libraries/Migo/Migo.Net/AsyncWebClient.cs	(working copy)
@@ -687,22 +687,20 @@
             
             while (nread != 0)
             {        
-                try {
-                    readTimeoutHandle.Reset ();
-                    
-                    // <hack> 
-                    // Yeah, Yeah, Yeah, I'll change this later, 
-                    // it's here to get around abort issues.
-                    
-                    ar = st.BeginRead (buffer, offset, length, null, null);
-                    nread = st.EndRead (ar);
-                    
-                    // need an auxiliary downloader class to replace this. 
-                    // </hack>
-                    
-                    readTimeoutHandle.Set ();
-                } catch { return; }
+                readTimeoutHandle.Reset ();
                 
+                // <hack> 
+                // Yeah, Yeah, Yeah, I'll change this later, 
+                // it's here to get around abort issues.
+                
+                ar = st.BeginRead (buffer, offset, length, null, null);
+                nread = st.EndRead (ar);
+                
+                // need an auxiliary downloader class to replace this. 
+                // </hack>
+                
+                readTimeoutHandle.Set ();
+                
                 if (writeToStream) {
                     dest.Write (buffer, 0, nread);
                 } else {
Index: src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs
===================================================================
--- src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs	(revision 5091)
+++ src/Libraries/Migo/Migo.DownloadCore/HttpFileDownloadTask.cs	(working copy)
@@ -419,7 +419,7 @@
 	            
                 try {                        
                     if (e.Error != null) {
-                        //Console.WriteLine ("DT {1} Error:  {0}", e.Error, this.Name);
+                        Hyena.Log.WarningFormat ("HttpDownloadTask {1} Error:  {0}", e.Error, this.Name);
                         WebException we = e.Error as WebException;
                         
                         if (we != null) {


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- banshee.spec	3 Mar 2009 03:26:46 -0000	1.68
+++ banshee.spec	27 Apr 2009 17:41:22 -0000	1.69
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.2
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -10,6 +10,8 @@
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Patch0:  banshee-1-1.4.2-podcast.patch
+Patch1:  banshee-1.4.3-podcast_download.patch
+Patch2:  banshee-1.4.3-coverart_query.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -112,6 +114,10 @@
 %prep
 %setup -q -n %{name}-1-%{version}
 %patch0 -p0 -b .podcast
+# This only improves error handling for downloads
+%patch1 -p0 -b .patch
+# This fixes the 100% CPU usage bug while fetching cover art
+%patch2 -p0 -b .coverart
 cp -p %{SOURCE1} .
 
 %build
@@ -197,6 +203,10 @@
 
 
 %changelog
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.2-4
+- add patch to fix rh#492707 - Banshee use 100% when fetching cover art
+- add patch for gnomebz #536047
+
 * Mon Mar  2 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-3.1
 - Rebuild for new mono-zeroconf