rpms/whaawmp/F-12 whaawmp-playnext.patch, NONE, 1.1 whaawmp.spec, 1.1, 1.2

[tomspur]

Author: tomspur

Update of /cvs/pkgs/rpms/whaawmp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv331

Modified Files:
	whaawmp.spec 
Added Files:
	whaawmp-playnext.patch 
Log Message:
add playnext patch (fixes #539608)

whaawmp-playnext.patch:
 main.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE whaawmp-playnext.patch ---
--- src/gui/main.py	2009-07-15 08:21:08.000000000 +0200
+++ src/gui/main.py2	2009-11-21 14:40:20.736483935 +0100
@@ -370,9 +370,11 @@
 	def playNext(self, widget=None, stop=True):
 		## Plays the next file in the queue (if it exists).
 		if (self.wTree.get_object("mnuiRandom").get_active()):
-			# If random is set, pick a random item from the queue.
-			# -1 because randint includes boundaries.
-			filename = queue.getTrackRemove(randint(0, queue.length()-1))
+			# If queue is empty randint(0,-1) will crash
+			if queue:
+				# If random is set, pick a random item from the queue.
+				# -1 because randint includes boundaries.
+				filename = queue.getTrackRemove(randint(0, queue.length()-1))
 		else:
 			# Otherwise just get the next item.
 			filename = queue.getNextTrackRemove()


Index: whaawmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-12/whaawmp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- whaawmp.spec	13 Oct 2009 16:48:17 -0000	1.1
+++ whaawmp.spec	21 Nov 2009 14:41:57 -0000	1.2
@@ -4,13 +4,15 @@
 
 Name:           whaawmp
 Version:        0.2.12.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight Media Player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://home.gna.org/whaawmp/
 Source0:        http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
+# fedora bug #539608
+Patch0:         %{name}-playnext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +33,7 @@ player without any GNOME dependencies.
 
 %prep
 %setup -q
+%patch0
 # remove shebangs
 for Files in src/thumbnailer.py src/whaawmp.py; do
   %{__sed} -i.orig -e 1d ${Files}
@@ -82,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Thomas Spura <tomspur at fedoraproject.org> - 0.2.12.1-3
+- add playnext patch (fixes #539608)
+
 * Sun Sep 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-2
 - Rework summary and description