rpms/gnome-applet-timer/F-12 gnome-applet-timer-2.1.2-fix-assignment.patch, NONE, 1.1 gnome-applet-timer.spec, 1.34, 1.35

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4525/F-12

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-fix-assignment.patch 
Log Message:
* Mon Nov 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-6
- Fix assignment when default sound is not found (#531877)


gnome-applet-timer-2.1.2-fix-assignment.patch:
 ChangeLog                                  |    6 ++++++
 src/timerapplet/controllers/TimerApplet.py |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-fix-assignment.patch ---
From: Jimmy Do <jimmydo at users.sourceforge.net>
Date: Sun, 20 Sep 2009 22:54:51 +0000 (-0700)
Subject: Fix assignment (bug #2862819)
X-Git-Url: http://timerapplet.git.sourceforge.net/git/gitweb.cgi?p=timerapplet%2Ftimerapplet;a=commitdiff_plain;h=18a21a2304bee4b62b36e4e6b68e1d0fef98f3b2

Fix assignment (bug #2862819)

* timer-applet/src/timerapplet/controllers/TimerApplet.py:
Fix assignment when error occurs while playing sound
---

diff --git a/timer-applet/ChangeLog b/timer-applet/ChangeLog
index 0bd0ec0..7dabf8f 100644
--- a/timer-applet/ChangeLog
+++ b/timer-applet/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-20  Jimmy Do  <jimmydo at users.sourceforge.net>
+	Fix assignment (bug #2862819)
+
+	* timer-applet/src/timerapplet/controllers/TimerApplet.py:
+	Fix assignment when error occurs while playing sound
+
 2009-02-26  Jimmy Do  <jimmydo at users.sourceforge.net>
 	* timer-applet/configure.ac:
 	Update version to 2.1.2
diff --git a/timer-applet/src/timerapplet/controllers/TimerApplet.py b/timer-applet/src/timerapplet/controllers/TimerApplet.py
index bcc856f..916c208 100644
--- a/timer-applet/src/timerapplet/controllers/TimerApplet.py
+++ b/timer-applet/src/timerapplet/controllers/TimerApplet.py
@@ -94,7 +94,7 @@ class TimerApplet(object):
                 self._gst_playbin.set_state(gst.STATE_NULL)
             elif t == gst.MESSAGE_ERROR:
                 self._gst_playbin.set_state(gst.STATE_NULL)
-                err, debug == message.parse_error()
+                err, debug = message.parse_error()
                 print 'Error playing sound: %s' % err, debug
             return True
         self._gst_playbin.get_bus().add_watch(bus_event)


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-12/gnome-applet-timer.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gnome-applet-timer.spec	30 Oct 2009 13:49:37 -0000	1.34
+++ gnome-applet-timer.spec	23 Nov 2009 22:02:05 -0000	1.35
@@ -1,18 +1,22 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
-%define debug_package %{nil}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
+%global debug_package %{nil}
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
-Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
-Patch0:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
-Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
+Source0:        http://downloads.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=531877
+# http://timerapplet.git.sourceforge.net/git/gitweb.cgi?p=timerapplet/timerapplet;a=commitdiff;h=18a21a2304bee4b62b36e4e6b68e1d0fef98f3b2
+Patch0:         gnome-applet-timer-2.1.2-fix-assignment.patch
+# update default sounds for the recent freedesktop sound themes
+Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
+Patch2:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -50,11 +54,12 @@ Timer Applet is a countdown timer applet
 
 %prep
 %setup -q -n timer-applet-%{version}
+%patch0 -p2 -b .fix-assignment
 %if 0%{?fedora} == 11
-%patch0 -p1 -b .freedesktop-0.2
+%patch1 -p1 -b .freedesktop-0.2
 %endif
 %if 0%{?fedora} >= 12
-%patch1 -p1 -b .freedesktop-0.7
+%patch2 -p1 -b .freedesktop-0.7
 %endif
 
 
@@ -114,6 +119,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Mon Nov 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-6
+- Fix assignment when default sound is not found (#531877)
+
 * Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
 - Use default sound form sound-theme-freedesktop (#531877)