From 4afbd987a98099cbd585545392cbb69013fd1e4d Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Wed, 19 Oct 2011 23:24:30 -0400 Subject: [PATCH 1/5] Update to 0.8.2 Restart the zeitgeist daemon on update (BZ #627982) --- sources | 2 +- zeitgeist.spec | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c346d6a..276862c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b6cfe8c9a123f1af8b998187f1dd18b zeitgeist-0.8.1.tar.gz +589e7de784d21177491780bffd11097d zeitgeist-0.8.2.tar.gz diff --git a/zeitgeist.spec b/zeitgeist.spec index e42eec4..f0d21cf 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,14 +2,14 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist -Source0: http://launchpad.net/%{name}/0.8/0.8.1/+download/%{name}-%{version}.tar.gz +Source0: http://launchpad.net/%{name}/0.8/0.8.2/+download/%{name}-%{version}.tar.gz BuildRequires: python-devel python-rdflib -BuildRequires: raptor +BuildRequires: raptor2 BuildRequires: gettext, perl(XML::Parser), intltool Requires: dbus zeitgeist-datahub Requires: dbus-python pygobject2 pyxdg @@ -37,6 +37,11 @@ make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install %find_lang %{name} +%post +if [ $1 -gt 1 ] ; then + /usr/bin/zeitgeist-daemon --replace +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README @@ -48,6 +53,10 @@ make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install %{_mandir}/man1/zeitgeist-*.* %changelog +* Tue Oct 18 2011 Deji Akingunola - 0.8.2-1 +- Update to 0.8.2 +- Restart the zeitgeist daemon on update (BZ #627982) + * Wed Jul 20 2011 Deji Akingunola - 0.8.1-1 - Update to 0.8.1 From a990f04473ab7be294926cde020d359f3362d648 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sat, 22 Oct 2011 11:04:49 -0400 Subject: [PATCH 2/5] Revert post-install script to restart zeitgeist daemon on update --- zeitgeist.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index f0d21cf..39073c8 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -3,7 +3,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist @@ -37,11 +37,6 @@ make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install %find_lang %{name} -%post -if [ $1 -gt 1 ] ; then - /usr/bin/zeitgeist-daemon --replace -fi - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README @@ -53,6 +48,9 @@ fi %{_mandir}/man1/zeitgeist-*.* %changelog +* Sat Oct 22 2011 Deji Akingunola - 0.8.2-2 +- Revert post-install script to restart zeitgeist daemon on update + * Tue Oct 18 2011 Deji Akingunola - 0.8.2-1 - Update to 0.8.2 - Restart the zeitgeist daemon on update (BZ #627982) From 0ae74f4230dd5c0c15ae4cc7b4a492d407feca4f Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 23:17:46 -0400 Subject: [PATCH 3/5] 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(-) create mode 100644 zeitgeist-0.9.0-crash-fix.patch 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 39073c8..1fb8f62 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,20 +2,20 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.8.2 -Release: 2%{?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 - 0.9.0-1 +- Update to 0.9.0 +- Apply upstream patch to fix a crasher bug. + * Sat Oct 22 2011 Deji Akingunola - 0.8.2-2 - Revert post-install script to restart zeitgeist daemon on update From 8b8a85e1825673596dc45d114fbde03898ed4cb6 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sun, 23 Sep 2012 20:36:44 -0400 Subject: [PATCH 4/5] Update to 0.9.5 --- sources | 2 +- zeitgeist-0.9.0-crash-fix.patch | 14 -------------- zeitgeist.spec | 9 +++++---- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 zeitgeist-0.9.0-crash-fix.patch diff --git a/sources b/sources index 20f427b..426d453 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc2706611f435a027cd520f0da0982d7 zeitgeist-0.9.0.tar.bz2 +5841e4624b07ba74866fb177f1c9aae7 zeitgeist-0.9.5.tar.bz2 diff --git a/zeitgeist-0.9.0-crash-fix.patch b/zeitgeist-0.9.0-crash-fix.patch deleted file mode 100644 index d8fa063..0000000 --- a/zeitgeist-0.9.0-crash-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 1fb8f62..7d04ae3 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,13 +2,12 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.0 +Version: 0.9.5 Release: 1%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist -Source0: http://launchpad.net/%{name}/0.9/0.9.0/+download/%{name}-%{version}.tar.bz2 -Patch1: zeitgeist-0.9.0-crash-fix.patch +Source0: http://launchpad.net/%{name}/0.9/0.9.5/+download/%{name}-%{version}.tar.bz2 BuildRequires: vala, python-devel, python-rdflib BuildRequires: glib2-devel, dbus-devel, sqlite-devel BuildRequires: raptor2, xapian-core-devel @@ -26,7 +25,6 @@ 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 @@ -55,6 +53,9 @@ make DESTDIR=%{buildroot} install %exclude %{_prefix}/doc/zeitgeist/ %changelog +* Sun Sep 23 2012 Deji Akingunola - 0.9.5-1 +- Update to 0.9.5 + * Mon May 21 2012 Deji Akingunola - 0.9.0-1 - Update to 0.9.0 - Apply upstream patch to fix a crasher bug. From 858948276d83e4a45a02ef1513105518fa4cd1e2 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 24 Sep 2012 09:05:04 -0400 Subject: [PATCH 5/5] Revert back to 0.9.0 release --- sources | 2 +- zeitgeist-0.9.0-crash-fix.patch | 14 ++++++++++++++ zeitgeist.spec | 9 ++++----- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 zeitgeist-0.9.0-crash-fix.patch diff --git a/sources b/sources index 426d453..20f427b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5841e4624b07ba74866fb177f1c9aae7 zeitgeist-0.9.5.tar.bz2 +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..935e30c --- /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 7d04ae3..ca6605a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,12 +2,13 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.5 +Version: 0.9.0 Release: 1%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist -Source0: http://launchpad.net/%{name}/0.9/0.9.5/+download/%{name}-%{version}.tar.bz2 +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 @@ -25,6 +26,7 @@ together with several different user interfaces. %prep %setup -q +%patch -p1 ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -53,9 +55,6 @@ make DESTDIR=%{buildroot} install %exclude %{_prefix}/doc/zeitgeist/ %changelog -* Sun Sep 23 2012 Deji Akingunola - 0.9.5-1 -- Update to 0.9.5 - * Mon May 21 2012 Deji Akingunola - 0.9.0-1 - Update to 0.9.0 - Apply upstream patch to fix a crasher bug.