rpms/soundconverter/devel soundconverter-1.5.2-div-by-zero.patch, NONE, 1.1 soundconverter.spec, 1.26, 1.27

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/soundconverter/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32445

Modified Files:
	soundconverter.spec 
Added Files:
	soundconverter-1.5.2-div-by-zero.patch 
Log Message:
* Tue Jun 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.2-2
- Fix ZeroDivisionError in progress calculation.


soundconverter-1.5.2-div-by-zero.patch:
 soundconverter.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE soundconverter-1.5.2-div-by-zero.patch ---
diff -Nur soundconverter-1.5.2-orig/src/soundconverter.py soundconverter-1.5.2/src/soundconverter.py
--- soundconverter-1.5.2-orig/src/soundconverter.py	2010-06-15 13:33:24.000000000 +0200
+++ soundconverter-1.5.2/src/soundconverter.py	2010-06-15 17:02:46.000000000 +0200
@@ -782,8 +782,11 @@
 			task.add_listener('finished', self.task_finished)
 			task.start()
 			self.count += 1
-		self.progress = float(self.finished_tasks) / (
+		if self.finished_tasks or len(self.waiting_tasks):
+			self.progress = float(self.finished_tasks) / (
 			len(self.waiting_tasks) + self.finished_tasks)
+		else:
+			self.progress = 0.0;
 
 	def started(self):
 		""" BackgroundTask setup callback """


Index: soundconverter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- soundconverter.spec	15 Jun 2010 14:28:57 -0000	1.26
+++ soundconverter.spec	15 Jun 2010 15:04:55 -0000	1.27
@@ -1,16 +1,20 @@
 Name:           soundconverter
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://soundconverter.berlios.de/
 Source0:        http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz
-Patch0:         soundconverter-1.5.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+# submitted upstream
+Patch0:         soundconverter-1.5.2-desktop.patch
+# submitted upstream
+Patch1:         soundconverter-1.5.2-div-by-zero.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool gettext
 BuildRequires:  pygtk2
@@ -34,6 +38,7 @@ writes anything the GStreamer library ca
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
+%patch1 -p1 -b .div-by-zero
 
 
 %build
@@ -87,6 +92,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Jun 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.2-2
+- Fix ZeroDivisionError in progress calculation.
+
 * Tue Jun 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.2-1
 - Upgrade to 1.5.2.