rpms/gnome-applet-timer/devel gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch, NONE, 1.1 gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch, NONE, 1.1 gnome-applet-timer.spec, 1.32, 1.33

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch 
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
- Use default sound form sound-theme-freedesktop (#531877)


gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:54:32.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/bell.ogg'

gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:48:24.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga'


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnome-applet-timer.spec	29 Oct 2009 20:25:26 -0000	1.32
+++ gnome-applet-timer.spec	30 Oct 2009 13:13:42 -0000	1.33
@@ -4,13 +4,15 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        4%{?dist}
+Release:        5%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -21,7 +23,11 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+%if 0%{?fedora} >= 10
+Requires:       sound-theme-freedesktop
+%else
 Requires:       gnome-audio
+%endif
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -44,6 +50,12 @@ Timer Applet is a countdown timer applet
 
 %prep
 %setup -q -n timer-applet-%{version}
+%if 0%{?fedora} == 11
+%patch0 -p1 -b .freedesktop-0.2
+%endif
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .freedesktop-0.7
+%endif
 
 
 %build
@@ -102,6 +114,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
+- Use default sound form sound-theme-freedesktop (#531877)
+
 * Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
 - Require gnome-audio (#531877)