[hamster-applet/f14/master] - Update to 2.31.90 - Changes in 2.31.90: - Maintaining selection on refresh in a more sane manner

[Mads Villadsen]

commit be7c38e9c708f138b98852d58bef8eef156b5413
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Sun Aug 22 22:08:43 2010 +0200

    - Update to 2.31.90
    - Changes in 2.31.90:
      - Maintaining selection on refresh in a more sane manner
      - Self-monitor the database not only for updates but also for remove/create (solves problems with some synchronization tools)
      - Fixed the global hotkey.
    - Changes in 2.31.6:
      - The top graph in overview is now interactive and allows zooming in and out
      - sqlite utf-8 case sensitivity workarounds for queries
      - Using full text search in the overview window now
      - Hopefully activity trees now behave better on refresh

 .gitignore                               |    1 +
 hamster-applet-remove-docky-helper.patch |   24 ++++++++++++++++++++++++
 hamster-applet.spec                      |   23 +++++++++++++++++++----
 sources                                  |    2 +-
 4 files changed, 45 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4fe051d..c418443 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hamster-applet-2.31.5.tar.bz2
+/hamster-applet-2.31.90.tar.bz2
diff --git a/hamster-applet-remove-docky-helper.patch b/hamster-applet-remove-docky-helper.patch
new file mode 100644
index 0000000..449dabf
--- /dev/null
+++ b/hamster-applet-remove-docky-helper.patch
@@ -0,0 +1,24 @@
+diff -r -u hamster-applet-2.31.90.org/wscript hamster-applet-2.31.90.remove_docky_helper/wscript
+--- hamster-applet-2.31.90.org/wscript	2010-08-15 20:03:24.000000000 +0200
++++ hamster-applet-2.31.90.remove_docky_helper/wscript	2010-08-22 21:34:45.819259017 +0200
+@@ -62,19 +62,6 @@
+     bld.install_files('${PYTHONDIR}/hamster', 'src/hamster/*.py')
+     bld.install_files('${PYTHONDIR}/hamster/widgets', 'src/hamster/widgets/*.py')
+ 
+-    bld.install_files('${DATADIR}/docky/helpers',
+-                      'src/docky_control/2.0/hamster_control.py',
+-                      chmod = 0755)
+-    bld.install_files('${DATADIR}/docky/helpers/metadata',
+-                      'src/docky_control/2.0/hamster_control.py.info')
+-
+-    # docky 2.1+ changes python API, folder and other things (how amusing)
+-    bld.install_files('${DATADIR}/dockmanager/scripts',
+-                      'src/docky_control/2.1/hamster_control.py',
+-                      chmod = 0755)
+-    bld.install_files('${DATADIR}/dockmanager/metadata',
+-                      'src/docky_control/2.1/hamster_control.py.info')
+-
+ 
+     bld.new_task_gen("subst",
+                      source= "org.gnome.hamster.service.in",
+Only in hamster-applet-2.31.90.remove_docky_helper: wscript~
diff --git a/hamster-applet.spec b/hamster-applet.spec
index f05775a..192800a 100644
--- a/hamster-applet.spec
+++ b/hamster-applet.spec
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.31.5
-Release:        3%{?dist}
+Version:        2.31.90
+Release:        1%{?dist}
 Summary:        Time tracking applet
 
 Group:          Applications/Productivity
@@ -11,6 +11,8 @@ License:        GPLv3+
 URL:            http://code.google.com/p/projecthamster/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.31/%{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
 
 BuildArch:      noarch
 
@@ -69,6 +71,7 @@ Time tracking for masses in GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -80,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 ./waf --destdir=%{buildroot} install
 %find_lang %{name}
-desktop-file-validate %{buildroot}/%{_datadir}/applications/hamster-standalone.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/hamster-time-tracker.desktop
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hamster-applet
 %{_datadir}/dbus-1/services/*
 %{_datadir}/icons/hicolor/*/apps/hamster-applet.*
-#%{_datadir}/gnome-control-center/keybindings/*
+%{_datadir}/gnome-control-center/keybindings/*
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/gnome/help/hamster-applet
@@ -104,6 +107,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 22 2010 Mads Villadsen <maxx at krakoa.dk> - 2.31.90-1
+- Update to 2.31.90
+- Changes in 2.31.90: 
+  - Maintaining selection on refresh in a more sane manner
+  - Self-monitor the database not only for updates but also for remove/create (solves problems with some synchronization tools)
+  - Fixed the global hotkey.
+- Changes in 2.31.6:
+  - The top graph in overview is now interactive and allows zooming in and out
+  - sqlite utf-8 case sensitivity workarounds for queries
+  - Using full text search in the overview window now
+  - Hopefully activity trees now behave better on refresh
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.31.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index c56a0bd..ba506ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97876e47552ee416f8f7969acb048ffd  hamster-applet-2.31.5.tar.bz2
+383f9c84995b4129517438c93bd0a39e  hamster-applet-2.31.90.tar.bz2