[zeitgeist/f17] Update to 0.9.0
Deji Akingunola
deji at fedoraproject.org
Mon May 21 15:54:51 UTC 2012
commit 19191613ca8a7b32b9d5881a3fb838f0d6a9c2ae
Author: Deji Akingunola <dakingun at gmail.com>
Date: Mon May 21 11:54:48 2012 -0400
Update to 0.9.0
- Apply upstream patch to fix a crasher bug.
sources | 2 +-
zeitgeist-0.9.0-crash-fix.patch | 14 ++++++++++++++
zeitgeist.spec | 37 ++++++++++++++++++++++++-------------
3 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/sources b/sources
index 276862c..20f427b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-589e7de784d21177491780bffd11097d zeitgeist-0.8.2.tar.gz
+fc2706611f435a027cd520f0da0982d7 zeitgeist-0.9.0.tar.bz2
diff --git a/zeitgeist-0.9.0-crash-fix.patch b/zeitgeist-0.9.0-crash-fix.patch
new file mode 100644
index 0000000..d8fa063
--- /dev/null
+++ b/zeitgeist-0.9.0-crash-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/extensions/fts++/indexer.cpp b/extensions/fts++/indexer.cpp
+index 72a5c73..483caf7 100644
+--- a/extensions/fts++/indexer.cpp
++++ b/extensions/fts++/indexer.cpp
+@@ -566,7 +566,8 @@ bool Indexer::IndexUri (std::string const& uri, std::string const& origin)
+ }
+ else
+ {
+- basename = g_file_get_basename (f);
++ // g_file_get_basename would unescape the uri, we don't want that here
++ basename = g_path_get_basename (uri.c_str ());
+ }
+
+ // step 2) unescape and check that it's valid utf8
diff --git a/zeitgeist.spec b/zeitgeist.spec
index aece71b..bfabb70 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -2,20 +2,20 @@
Summary: Framework providing Desktop activity awareness
Name: zeitgeist
-Version: 0.8.2
-Release: 3%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Group: User Interface/Desktops
License: LGPLv2+
URL: https://launchpad.net/zeitgeist
-Source0: http://launchpad.net/%{name}/0.8/0.8.2/+download/%{name}-%{version}.tar.gz
-BuildRequires: python-devel python-rdflib
-BuildRequires: raptor2
+Source0: http://launchpad.net/%{name}/0.9/0.9.0/+download/%{name}-%{version}.tar.bz2
+Patch1: zeitgeist-0.9.0-crash-fix.patch
+BuildRequires: vala, python-devel, python-rdflib
+BuildRequires: glib2-devel, dbus-devel, sqlite-devel
+BuildRequires: raptor2, xapian-core-devel
BuildRequires: gettext, perl(XML::Parser), intltool
Requires: dbus zeitgeist-datahub
Requires: dbus-python pygobject2 pyxdg
-BuildArch: noarch
-
%description
Zeitgeist is a service which logs the users's activities and events (files
opened, websites visites, conversations hold with other people, etc.) and makes
@@ -26,6 +26,11 @@ together with several different user interfaces.
%prep
%setup -q
+%patch1 -p1
+
+## nuke unwanted rpaths, see also
+## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
%configure
@@ -33,21 +38,27 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install
+make DESTDIR=%{buildroot} install
-%find_lang %{name}
+#%find_lang %{name}
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README
+%doc AUTHORS COPYING NEWS
%{_bindir}/zeitgeist-daemon
+%{_libexecdir}/zeitgeist-fts
%{_datadir}/%{name}/
-%{_datadir}/pkgconfig/zeitgeist-daemon.pc
%{python_sitelib}/zeitgeist/
-%{_datadir}/dbus-1/services/org.gnome.zeitgeist.service
+%{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service
%{_mandir}/man1/zeitgeist-*.*
+%exclude %{_prefix}/doc/zeitgeist/
%changelog
+* Mon May 21 2012 Deji Akingunola <dakingun at gmail.com> - 0.9.0-1
+- Update to 0.9.0
+- Apply upstream patch to fix a crasher bug.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list