[gnome-activity-journal] - Update to latest release - Add minor patch to make the version check work with zeitgeist 0.5.0

[Mads Villadsen]

commit 6b915ee260ba2bbcdb49d008e03bb9a450b2bff5
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Tue Aug 24 21:18:32 2010 +0200

    - Update to latest release
    - Add minor patch to make the version check work with zeitgeist 0.5.0

 .gitignore                                         |    1 +
 ...ournal-0.5.0-zeitgeist-version-workaround.patch |   12 +++++++++
 gnome-activity-journal.spec                        |   25 ++++++++++++--------
 sources                                            |    2 +-
 4 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9235ee6..eedc5db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-activity-journal-0.3.4.1-bzr1010.tar.gz
+/gnome-activity-journal-0.5.0.tar.gz
diff --git a/gnome-activity-journal-0.5.0-zeitgeist-version-workaround.patch b/gnome-activity-journal-0.5.0-zeitgeist-version-workaround.patch
new file mode 100644
index 0000000..8d300be
--- /dev/null
+++ b/gnome-activity-journal-0.5.0-zeitgeist-version-workaround.patch
@@ -0,0 +1,12 @@
+diff -r -u gnome-activity-journal-0.5.0.org/gnome-activity-journal gnome-activity-journal-0.5.0/gnome-activity-journal
+--- gnome-activity-journal-0.5.0.org/gnome-activity-journal	2010-08-23 21:44:46.000000000 +0200
++++ gnome-activity-journal-0.5.0/gnome-activity-journal	2010-08-24 21:06:39.033888869 +0200
+@@ -91,7 +91,7 @@
+     print "%s" % e
+     sys.exit(1)
+ 
+-if CLIENT.get_version() < [0, 4, 9, 99]:
++if CLIENT.get_version() < [0, 4, 0]:
+     print "You need Zeitgeist 0.5.0 or later for the GNOME Activity Journal to work."
+     print "https://launchpad.net/zeitgeist"
+     sys.exit(1)
diff --git a/gnome-activity-journal.spec b/gnome-activity-journal.spec
index 314fa78..302fa45 100644
--- a/gnome-activity-journal.spec
+++ b/gnome-activity-journal.spec
@@ -1,27 +1,25 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_revision 1010
 Name:           gnome-activity-journal
-Version:        0.3.4.1
-Release:        2.20100721bzr1010%{?dist}
-# to check out this version do:
-#    bzr co -r 1010 lp:gnome-activity-journal gnome-activity-journal-0.3.4.1-bzr1010
-#    rm -rf gnome-activity-journal-0.3.4.1-bzr1010/.bzr
-#    tar zcf gnome-activity-journal-0.3.4.1-bzr1010.tar.gz gnome-activity-journal-0.3.4.1-bzr1010
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Browse and search your Zeitgeist activities
 
 Group:          Applications/File
 License:        GPLv3+
 URL:            https://launchpad.net/%{name}
-Source0:        http://launchpad.net/%{name}/0.3/%{version}/+download/%{name}-%{version}-bzr%{bzr_revision}.tar.gz
+Source0:        http://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Simple patch to get rid of rpmlint error about non-executable script
 Patch1:         %{name}-non-executable-script-fix.patch
+# Simple patch that has a temporary workaround for checking the version of zeitgeist
+# zeitgeist 0.5.0 shipped claiming to be 0.4.0 in its dbus api
+Patch2:         %{name}-0.5.0-zeitgeist-version-workaround.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel python-distutils-extra desktop-file-utils intltool
-Requires:       zeitgeist >= 0.3.1
+Requires:       zeitgeist >= 0.5.0
 Requires:       hicolor-icon-theme
 Requires:       pygtk2 pygobject2
 Requires:       gnome-python2-gnome gnome-python2-gconf pycairo
@@ -74,8 +72,9 @@ It shows a chronological journal of all file
 activity.
 
 %prep
-%setup -q -n %{name}-%{version}-bzr%{bzr_revision}
+%setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -108,9 +107,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/*/*
 %{python_sitelib}/*
 
+%{_datadir}/zeitgeist/_zeitgeist/engine/extensions/gnome_activity_journal.*
+
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Mon Aug 23 2010 Mads Villadsen <maxx at krakoa.dk> - 0.5.0-1
+- Update to latest release
+- Add minor patch to make the version check work with zeitgeist 0.5.0
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.4.1-2.20100721bzr1010
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index cfc8d5f..3f8248d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffd686a10867f7050eca9dc1525c1041  gnome-activity-journal-0.3.4.1-bzr1010.tar.gz
+ce392557e7f1ec4b60b60e14dc250723  gnome-activity-journal-0.5.0.tar.gz