[hamster-applet] Update to latest stable release Some fixes for python 2.7 Temporarily drop evolution support as gnom

[Mads Villadsen]

commit e919021973cc4fab0f172162f7bb7e82b1617c88
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Mon May 2 00:20:14 2011 +0200

    Update to latest stable release
    Some fixes for python 2.7
    Temporarily drop evolution support as gnome-python2-evolution has yet to be updated to the latest version of evolution
    Remove gnome-python2-applet as a requirement
    Add patch to drop applet support as gnome-shell doesn not support applets
    Drop bugfix patch as fix is now in the release

 .gitignore                                 |    1 +
 hamster-applet-remove-applet-install.patch |   13 +++++++++++++
 hamster-applet.spec                        |   28 +++++++++++++++++++---------
 sources                                    |    2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1244a20..ce8f3cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ hamster-applet-2.31.5.tar.bz2
 /hamster-applet-2.31.90.tar.bz2
 /hamster-applet-2.31.91.tar.bz2
 /hamster-applet-2.32.0.tar.bz2
+/hamster-applet-2.32.1.tar.bz2
diff --git a/hamster-applet-remove-applet-install.patch b/hamster-applet-remove-applet-install.patch
new file mode 100644
index 0000000..cf476c8
--- /dev/null
+++ b/hamster-applet-remove-applet-install.patch
@@ -0,0 +1,13 @@
+diff -r -u hamster-applet-2.32.1/data/wscript_build hamster-applet-2.32.1.remove-applet-install/data/wscript_build
+--- hamster-applet-2.32.1/data/wscript_build	2010-11-06 02:20:33.000000000 +0100
++++ hamster-applet-2.32.1.remove-applet-install/data/wscript_build	2011-05-02 00:03:41.782694642 +0200
+@@ -52,9 +52,3 @@
+     install_path = '${DATADIR}/applications',
+     podir    = '../po',
+     flags    = ['-d', '-q', '-u', '-c'])
+-
+-bld(features = 'intltool_in',
+-    source   = 'Hamster_Applet.server.in',
+-    install_path = '${LIBDIR}/bonobo/servers',
+-    podir    = '../po',
+-    flags    = ['-o', '-u', '-c'])
diff --git a/hamster-applet.spec b/hamster-applet.spec
index 0064665..ac57b29 100644
--- a/hamster-applet.spec
+++ b/hamster-applet.spec
@@ -6,31 +6,33 @@
 %global debug_package %{nil}
 
 Name:           hamster-applet
-Version:        2.32.0
-Release:        5%{?dist}
+Version:        2.32.1
+Release:        1%{?dist}
 Summary:        Time tracking applet
 
 Group:          Applications/Productivity
 License:        GPLv3+
-URL:            http://code.google.com/p/projecthamster/
+URL:            http://projecthamster.wordpress.com/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.32/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # since Fedora isn't shipping Docky it doesn't make any sense including the Docky helpers
 Patch0:         hamster-applet-remove-docky-helper.patch
-# a temporary fix for gnome bug #663103 which will be fixed in 2.30.1
-Patch1:         hamster-applet-gnome-bug-633103.patch
+# Fedora 15 has switched to gnome-shell and therefore applets are no longer supported. So drop the installation of applet-related files
+Patch1:         hamster-applet-remove-applet-install.patch
 
 BuildRequires:  python-devel pygtk2-devel pygobject2-devel gnome-python2-devel
-BuildRequires:  perl(XML::Parser) gnome-python2-applet python-sqlite2
+BuildRequires:  perl(XML::Parser) python-sqlite2
 BuildRequires:  gtk2-devel gettext libXScrnSaver-devel intltool gnome-doc-utils
 # for gnome-keybindings.pc
 BuildRequires:  control-center >= 2.19.4
 BuildRequires:  desktop-file-utils
 
 Requires:       hicolor-icon-theme
-Requires:       pygtk2, pygobject2, gnome-python2-applet, python-sqlite2
+Requires:       pygtk2, pygobject2, python-sqlite2
 Requires:       gnome-python2-gnome
-Requires:       gnome-python2-gconf, gnome-python2-evolution, pycairo
+Requires:       gnome-python2-gconf, pycairo
+# temporarily drop evolution support as gnome-python2-evolution has yet to be updated to the latest version of evolution
+#Requires:       gnome-python2-evolution
 # for /usr/share/control-center/keybindings
 Requires:       control-center-filesystem
 Requires:       pyxdg, dbus-python
@@ -99,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{python_sitelib}/hamster
-%{_libdir}/bonobo/servers/Hamster_Applet.server
+#%{_libdir}/bonobo/servers/Hamster_Applet.server
 %{_libdir}/hamster-applet
 %{_datadir}/hamster-applet
 %{_datadir}/dbus-1/services/*
@@ -113,6 +115,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May  1 2011 Mads Villadsen <maxx at krakoa.dk> - 2.32.1-1
+- Update to latest stable release
+- Some fixes for python 2.7
+- Temporarily drop evolution support as gnome-python2-evolution has yet to be updated to the latest version of evolution
+- Remove gnome-python2-applet as a requirement
+- Add patch to drop applet support as gnome-shell doesn not support applets
+- Drop bugfix patch as fix is now in the release
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d1d0469..5c21555 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-325b7faea3be2bf96cf8ec8acac702b4  hamster-applet-2.32.0.tar.bz2
+d870111be6106b30338bfc8d6f5df454  hamster-applet-2.32.1.tar.bz2