rpms/banshee/devel banshee-1.4.3-podcast_download.patch, NONE, 1.1 banshee.spec, 1.73, 1.74 import.log, 1.3, 1.4

[David Nielsen]

Author: dnielsen

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

Modified Files:
	banshee.spec import.log 
Added Files:
	banshee-1.4.3-podcast_download.patch 
Log Message:
Apply patch for gnomebz #536047


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/devel/banshee.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- banshee.spec	5 Mar 2009 11:03:58 -0000	1.73
+++ banshee.spec	6 Mar 2009 23:36:30 -0000	1.74
@@ -2,13 +2,14 @@
 
 Name:    banshee
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
+Patch0:  banshee-1.4.3-podcast_download.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -111,6 +112,7 @@
 %prep
 %setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
+%patch0 -p0 -b .patch
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -195,6 +197,9 @@
 
 
 %changelog
+* Sat Mar 07 2009 David Nielsen <dnielsen at fedoraproject.org> - 1.4.3-2
+- add patch for gnomebz #536047
+
 * Thu Mar 05 2009 David Nielsen <dnielsen at fedoraproject.org> - 1.4.3-1
 - Update to 1.4.3
 - Remove upstreamed patch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	5 Mar 2009 11:03:58 -0000	1.3
+++ import.log	6 Mar 2009 23:36:30 -0000	1.4
@@ -1,3 +1,4 @@
 banshee-1_4_2-5_fc11:HEAD:banshee-1.4.2-5.fc11.src.rpm:1235468555
 banshee-1_4_2-6_fc11:HEAD:banshee-1.4.2-6.fc11.src.rpm:1235582276
 banshee-1_4_3-1_fc11:HEAD:banshee-1.4.3-1.fc11.src.rpm:1236250928
+banshee-1_4_3-2_fc11:HEAD:banshee-1.4.3-2.fc11.src.rpm:1236382488