rpms/gnome-applet-timer/F-13 gnome-applet-timer-2.1.3-gtk-runtimerror.patch, NONE, 1.1 gnome-applet-timer.spec, 1.36, 1.37 gnome-applet-timer-2.1.2-fix-assignment.patch, 1.1, NONE gnome-applet-timer-2.1.2-gtk-runtimerror.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22201/F-13

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.3-gtk-runtimerror.patch 
Removed Files:
	gnome-applet-timer-2.1.2-fix-assignment.patch 
	gnome-applet-timer-2.1.2-gtk-runtimerror.patch 
Log Message:
* Sat Jul 09 2010 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.3-1
- Update to 2.1.3 (first version by new maintainer)
- Adjust URL and Source0 location
- Drop fix-assignment.patch, already upstream
- Update GConf scriptlets
- Only run scrollkeeper scriptlets on RHEL/EPEL.


gnome-applet-timer-2.1.3-gtk-runtimerror.patch:
 timer-applet |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.3-gtk-runtimerror.patch ---
--- src/timer-applet.orig	2010-07-10 10:29:03.000000000 +0200
+++ src/timer-applet	2010-07-10 10:16:24.000000000 +0200
@@ -20,7 +20,11 @@
 import gettext
 import locale
 import sys
-import gtk
+try:
+    import gtk
+except RuntimeError:
+    print sys.stderr, "Couldn't import gtk. Do you have a running X session?"
+    sys.exit(1)
 import gnomeapplet
 from timerapplet import config
 from timerapplet.controllers import GlobalController, TimerApplet, TimerService, TimerManagerService


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-13/gnome-applet-timer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gnome-applet-timer.spec	20 Jun 2010 17:31:16 -0000	1.36
+++ gnome-applet-timer.spec	10 Jul 2010 08:45:25 -0000	1.37
@@ -1,25 +1,23 @@
 %{!?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}
+%global srcname timer-applet
 
 Name:           gnome-applet-timer
-Version:        2.1.2
-Release:        7%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://timerapplet.sourceforge.net/
-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
+URL:            https://launchpad.net/timer-applet
+Source0:        http://launchpad.net/%{srcname}/trunk/%{version}/+download/%{srcname}-%{version}.tar.gz
 # 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
 # fix for https://bugzilla.redhat.com/show_bug.cgi?id=553757
 # When gtk fails to start, die gracefully
-Patch3:         gnome-applet-timer-2.1.2-gtk-runtimerror.patch
+Patch3:         gnome-applet-timer-2.1.3-gtk-runtimerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -40,7 +38,7 @@ Requires:       gnome-audio
 Requires:       python-elementtree
 %endif
 
-Provides:       timer-applet = %{version}
+Provides:       %{srcname} = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -56,8 +54,7 @@ Timer Applet is a countdown timer applet
 
 
 %prep
-%setup -q -n timer-applet-%{version}
-%patch0 -p2 -b .fix-assignment
+%setup -q -n %{srcname}-%{version}
 %if 0%{?fedora} == 11
 %patch1 -p1 -b .freedesktop-0.2
 %endif
@@ -75,7 +72,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang timer-applet
+%find_lang %{srcname}
 
 
 %clean
@@ -83,46 +80,47 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-fi
+%gconf_schema_prepare %{srcname}
 
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
+%gconf_schema_upgrade %{srcname}
 
+%if 0%{?rhel}
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
+%endif
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
-fi
+%gconf_schema_remove %{srcname}
 
 
 %postun
+%if 0%{?rhel}
 scrollkeeper-update -q || :
+%endif
 
 
-%files -f timer-applet.lang
+%files -f %{srcname}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_sysconfdir}/gconf/schemas/timer-applet.schemas
+%{_sysconfdir}/gconf/schemas/%{srcname}.schemas
 %{_libdir}/bonobo/servers/TimerApplet.server
-%dir %{_libdir}/timer-applet
-%{_libdir}/timer-applet/timer-applet
-%{_datadir}/pixmaps/timer-applet.png
-%{_datadir}/timer-applet/
+%dir %{_libdir}/%{srcname}
+%{_libdir}/%{srcname}/%{srcname}
+%{_datadir}/pixmaps/%{srcname}.png
+%{_datadir}/%{srcname}/
 %{python_sitelib}/timerapplet/
 
 
 %changelog
+* Sat Jul 09 2010 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.3-1
+- Update to 2.1.3 (first version by new maintainer)
+- Adjust URL and Source0 location
+- Drop fix-assignment.patch, already upstream
+- Update GConf scriptlets
+- Only run scrollkeeper scriptlets on RHEL/EPEL.
+
 * Sun Jun 20 2010 Thomas Spura <tomspur at fedoraproject.org> 2.1.2-7
 - gracefully exit, when there is no X
 


--- gnome-applet-timer-2.1.2-fix-assignment.patch DELETED ---


--- gnome-applet-timer-2.1.2-gtk-runtimerror.patch DELETED ---