From d4aef320c856928a525488feb3846095c15439e8 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Tue, 18 Oct 2011 10:07:50 -0400 Subject: [PATCH 01/91] Update to 0.8.2 Restart the zeitgeist daemon on update (BZ #627982) --- .gitignore | 1 + sources | 2 +- zeitgeist.spec | 13 +++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bbac0dc..2ca6be9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.7.tar.gz /zeitgeist-0.8.0.tar.gz /zeitgeist-0.8.1.tar.gz +/zeitgeist-0.8.2.tar.gz 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..8e8fdd7 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,12 +2,12 @@ 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: gettext, perl(XML::Parser), intltool @@ -35,6 +35,11 @@ make %{?_smp_mflags} rm -rf %{buildroot} make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install +%post +if [ $1 -gt 1 ] ; then + /usr/bin/zeitgeist-daemon --replace +fi + %find_lang %{name} %files -f %{name}.lang @@ -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 e737536dcdadb714ed7e3128513da678fe90931c Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Tue, 18 Oct 2011 10:26:25 -0400 Subject: [PATCH 02/91] Requires raptor2 instead of raptor in F16+ --- zeitgeist.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 8e8fdd7..d54c207 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -9,7 +9,7 @@ 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: raptor +BuildRequires: raptor2 BuildRequires: gettext, perl(XML::Parser), intltool Requires: dbus zeitgeist-datahub Requires: dbus-python pygobject2 pyxdg From e61e71dc5937b9633ae505a8291178168becf47f Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Wed, 19 Oct 2011 23:16:14 -0400 Subject: [PATCH 03/91] Put find_land macro in the right place --- zeitgeist.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index d54c207..f0d21cf 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -35,13 +35,13 @@ make %{?_smp_mflags} rm -rf %{buildroot} make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install +%find_lang %{name} + %post if [ $1 -gt 1 ] ; then /usr/bin/zeitgeist-daemon --replace fi -%find_lang %{name} - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README From 4afbd987a98099cbd585545392cbb69013fd1e4d Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Wed, 19 Oct 2011 23:24:30 -0400 Subject: [PATCH 04/91] 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 661ebb45ab2102835f14352194b2e3159ffbe11c Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sat, 22 Oct 2011 11:04:13 -0400 Subject: [PATCH 05/91] 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 a990f04473ab7be294926cde020d359f3362d648 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sat, 22 Oct 2011 11:04:49 -0400 Subject: [PATCH 06/91] 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 ce53f732e1f3b02e581a5ad366b6aeea615924a3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:34:53 -0600 Subject: [PATCH 07/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 39073c8..aece71b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -3,7 +3,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist @@ -48,6 +48,9 @@ make DESTDIR=%{buildroot} pkgconfigdir=%{_datadir}/pkgconfig install %{_mandir}/man1/zeitgeist-*.* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Oct 22 2011 Deji Akingunola - 0.8.2-2 - Revert post-install script to restart zeitgeist daemon on update From 07f2acc76288cd3a34ac02e16c76d28dcbd75893 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 09:42:13 -0400 Subject: [PATCH 08/91] Update to 0.9.0 - Apply upstream patch to fix a crasher bug. --- .gitignore | 1 + sources | 2 +- zeitgeist-0.9.0-crash-fix.patch | 14 +++++++++++++ zeitgeist.spec | 37 +++++++++++++++++++++------------ 4 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 zeitgeist-0.9.0-crash-fix.patch diff --git a/.gitignore b/.gitignore index 2ca6be9..142a61f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.8.0.tar.gz /zeitgeist-0.8.1.tar.gz /zeitgeist-0.8.2.tar.gz +/zeitgeist-0.9.0.tar.bz2 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..b63dd4a 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, 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 Jan 14 2012 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 244e900d9f42a0e2f048edb1449cbd1b248ab083 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 10:49:46 -0400 Subject: [PATCH 09/91] Add dbus-devel BR --- zeitgeist.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index b63dd4a..bfabb70 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -10,7 +10,7 @@ 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 BuildRequires: vala, python-devel, python-rdflib -BuildRequires: glib2-devel, sqlite-devel +BuildRequires: glib2-devel, dbus-devel, sqlite-devel BuildRequires: raptor2, xapian-core-devel BuildRequires: gettext, perl(XML::Parser), intltool Requires: dbus zeitgeist-datahub From 09d47decce084c0b382f375c18042252764e2d68 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 22:31:13 -0400 Subject: [PATCH 10/91] Add patch to fix dso build failure --- zeitgeist-dso-build-fix.patch | 10 ++++++++++ zeitgeist.spec | 1 + 2 files changed, 11 insertions(+) create mode 100644 zeitgeist-dso-build-fix.patch diff --git a/zeitgeist-dso-build-fix.patch b/zeitgeist-dso-build-fix.patch new file mode 100644 index 0000000..6a150f9 --- /dev/null +++ b/zeitgeist-dso-build-fix.patch @@ -0,0 +1,10 @@ +--- configure 2012-04-10 09:33:12.000000000 -0400 ++++ configure.new 2012-05-21 22:12:20.121924192 -0400 +@@ -16922,6 +16922,7 @@ + ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 >= $GLIB_REQUIRED + gio-unix-2.0 >= $GLIB_REQUIRED ++ gmodule-2.0 >= $GLIB_REQUIRED + sqlite3 >= $SQLITE_REQUIRED" + + diff --git a/zeitgeist.spec b/zeitgeist.spec index bfabb70..469cfbc 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -9,6 +9,7 @@ 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 +Patch2: zeitgeist-dso-build-fix.patch BuildRequires: vala, python-devel, python-rdflib BuildRequires: glib2-devel, dbus-devel, sqlite-devel BuildRequires: raptor2, xapian-core-devel From a6f9b1d2b18ba1afe13dcc3b85754538f4158e76 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 23:00:14 -0400 Subject: [PATCH 11/91] Apply the last patch --- zeitgeist.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeitgeist.spec b/zeitgeist.spec index 469cfbc..010b228 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -28,6 +28,7 @@ together with several different user interfaces. %prep %setup -q %patch1 -p1 +%patch2 -p0 ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath From 0ae74f4230dd5c0c15ae4cc7b4a492d407feca4f Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mon, 21 May 2012 23:17:46 -0400 Subject: [PATCH 12/91] 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 8553ccca9f1fe162b869159181b7dd423a52aac4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:07:39 -0500 Subject: [PATCH 13/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 010b228..b824c4d 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -3,7 +3,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist @@ -57,6 +57,9 @@ make DESTDIR=%{buildroot} install %exclude %{_prefix}/doc/zeitgeist/ %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon May 21 2012 Deji Akingunola - 0.9.0-1 - Update to 0.9.0 - Apply upstream patch to fix a crasher bug. From db2e44bca1d83fba25a3208488955e4f939f0b3c Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sun, 23 Sep 2012 19:51:55 -0400 Subject: [PATCH 14/91] Update to 0.9.5 --- .gitignore | 1 + sources | 2 +- zeitgeist-0.9.0-crash-fix.patch | 14 -------------- zeitgeist-dso-build-fix.patch | 10 ---------- zeitgeist.spec | 13 ++++++------- 5 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 zeitgeist-0.9.0-crash-fix.patch delete mode 100644 zeitgeist-dso-build-fix.patch diff --git a/.gitignore b/.gitignore index 142a61f..ebf006a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.8.1.tar.gz /zeitgeist-0.8.2.tar.gz /zeitgeist-0.9.0.tar.bz2 +/zeitgeist-0.9.5.tar.bz2 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-dso-build-fix.patch b/zeitgeist-dso-build-fix.patch deleted file mode 100644 index 6a150f9..0000000 --- a/zeitgeist-dso-build-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure 2012-04-10 09:33:12.000000000 -0400 -+++ configure.new 2012-05-21 22:12:20.121924192 -0400 -@@ -16922,6 +16922,7 @@ - ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -+ gmodule-2.0 >= $GLIB_REQUIRED - sqlite3 >= $SQLITE_REQUIRED" - - diff --git a/zeitgeist.spec b/zeitgeist.spec index b824c4d..22372b0 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,14 +2,12 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.0 -Release: 2%{?dist} +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 -Patch2: zeitgeist-dso-build-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 @@ -27,8 +25,6 @@ together with several different user interfaces. %prep %setup -q -%patch1 -p1 -%patch2 -p0 ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -57,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 + * Sun Jul 22 2012 Fedora Release Engineering - 0.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8b8a85e1825673596dc45d114fbde03898ed4cb6 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sun, 23 Sep 2012 20:36:44 -0400 Subject: [PATCH 15/91] 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 16/91] 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. From dcb78ce46885f743ad45cb820cfac1d883e4667c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:18:06 -0600 Subject: [PATCH 17/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 22372b0..e828cb1 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -3,7 +3,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: User Interface/Desktops License: LGPLv2+ URL: https://launchpad.net/zeitgeist @@ -53,6 +53,9 @@ make DESTDIR=%{buildroot} install %exclude %{_prefix}/doc/zeitgeist/ %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Sep 23 2012 Deji Akingunola - 0.9.5-1 - Update to 0.9.5 From 60b8977e35bb191900ba4ae83dde2d3b05289cc2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 14 Apr 2013 14:19:55 +0200 Subject: [PATCH 18/91] Minor spec file cleanup for recent rpmbuild --- zeitgeist.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index e828cb1..2394f5d 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,10 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.5 Release: 2%{?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 @@ -35,14 +32,12 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure make %{?_smp_mflags} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install #%find_lang %{name} #%files -f %{name}.lang %files -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS %{_bindir}/zeitgeist-daemon %{_libexecdir}/zeitgeist-fts From ae053412ebd6cd6ddb59d98e7a431922b0a88c68 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 14 Apr 2013 14:22:12 +0200 Subject: [PATCH 19/91] Organize the BRs one per line ... to make it easier to add/remove BRs. Multiple BRs in one line make it hard to review diffs. --- zeitgeist.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 2394f5d..2cda46b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -5,12 +5,22 @@ Release: 2%{?dist} License: LGPLv2+ URL: https://launchpad.net/zeitgeist 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 -BuildRequires: gettext, perl(XML::Parser), intltool -Requires: dbus zeitgeist-datahub -Requires: dbus-python pygobject2 pyxdg + +BuildRequires: dbus-devel +BuildRequires: gettext +BuildRequires: glib2-devel +BuildRequires: intltool +BuildRequires: python-devel +BuildRequires: python-rdflib +BuildRequires: raptor2 +BuildRequires: sqlite-devel +BuildRequires: vala +BuildRequires: xapian-core-devel +Requires: dbus +Requires: dbus-python +Requires: pygobject2 +Requires: pyxdg +Requires: zeitgeist-datahub %description Zeitgeist is a service which logs the users's activities and events (files From 6ea2e9035b61d3170d527858e0f8a52f1ffc43a3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 14 Apr 2013 14:33:06 +0200 Subject: [PATCH 20/91] Update to 0.9.12 (#949286) This update incorporates two packages that were distributed separatately before: zeitgeist-datahub and libzeitgeist. The latter has also gone through some API changes, and the library name has changed from the standalone libzeitgeist-1.0 to libzeitgeist-2.0. This ensures that the version bundled with zeitgeist and the separately packaged libzeitgeist are parallel installable, making it possible to keep the standalone libzeitgeist package around until all users have been ported over. The separate zeitgeist-datahub however needs to be retired. (F19+ only, please don't cherry-pick it to earlier releases.) --- .gitignore | 1 + sources | 2 +- zeitgeist.spec | 72 +++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ebf006a..f2f801b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.8.2.tar.gz /zeitgeist-0.9.0.tar.bz2 /zeitgeist-0.9.5.tar.bz2 +/zeitgeist-0.9.12.tar.xz diff --git a/sources b/sources index 426d453..600eb4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5841e4624b07ba74866fb177f1c9aae7 zeitgeist-0.9.5.tar.bz2 +58488a7636a663a700be2b1d1a639e40 zeitgeist-0.9.12.tar.xz diff --git a/zeitgeist.spec b/zeitgeist.spec index 2cda46b..91ecb16 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,26 +1,29 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.5 -Release: 2%{?dist} +Version: 0.9.12 +Release: 1%{?dist} 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/%{version}/+download/%{name}-%{version}.tar.xz BuildRequires: dbus-devel BuildRequires: gettext BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel BuildRequires: intltool +BuildRequires: json-glib-devel BuildRequires: python-devel BuildRequires: python-rdflib BuildRequires: raptor2 BuildRequires: sqlite-devel +BuildRequires: telepathy-glib-devel BuildRequires: vala BuildRequires: xapian-core-devel Requires: dbus Requires: dbus-python -Requires: pygobject2 -Requires: pyxdg -Requires: zeitgeist-datahub + +Obsoletes: zeitgeist-datahub < 0.9.10 %description Zeitgeist is a service which logs the users's activities and events (files @@ -30,6 +33,24 @@ relevant information available to other applications. Note that this package only contains the daemon, which you can use together with several different user interfaces. + +%package libs +Summary: Client library for interacting with the Zeitgeist daemon + +%description libs +Libzeitgeist is a client library for interacting with the Zeitgeist +daemon. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + %prep %setup -q @@ -38,26 +59,59 @@ together with several different user interfaces. sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build -%configure +%configure --enable-fts make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_libdir}/*.la + +# We install AUTHORS and NEWS with %%doc instead +rm -rf %{buildroot}%{_datadir}/zeitgeist/doc + #%find_lang %{name} +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + #%files -f %{name}.lang %files -%doc AUTHORS COPYING NEWS +%doc AUTHORS COPYING COPYING.GPL NEWS %{_bindir}/zeitgeist-daemon +%{_bindir}/zeitgeist-datahub %{_libexecdir}/zeitgeist-fts %{_datadir}/%{name}/ %{python_sitelib}/zeitgeist/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/zeitgeist-daemon %{_mandir}/man1/zeitgeist-*.* -%exclude %{_prefix}/doc/zeitgeist/ +%{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop + +%files libs +%doc COPYING +%{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib +%{_libdir}/libzeitgeist-2.0.so.* + +%files devel +%{_includedir}/zeitgeist-2.0/ +%{_libdir}/libzeitgeist-2.0.so +%{_libdir}/pkgconfig/zeitgeist-2.0.pc +%{_datadir}/gir-1.0/Zeitgeist-2.0.gir +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/zeitgeist-2.0.deps +%{_datadir}/vala/vapi/zeitgeist-2.0.vapi +%{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Apr 14 2013 Kalev Lember - 0.9.12-1 +- Update to 0.9.12 (#949286) +- Obsolete zeitgeist-datahub +- Package up the libzeitgeist-2.0 library + * Fri Feb 15 2013 Fedora Release Engineering - 0.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 2c35690b94107bd7762608dc19d16ac46e656603 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 15 Apr 2013 18:50:14 +0200 Subject: [PATCH 21/91] Update the license tag ... and add a spec file comment with longer explanations. The incorporated zeitgeist-datahub and other code from separate sources has made the licensing situation for the daemon package more complicated. The library sub-package, however, is still cleanly LGPLv2+. --- zeitgeist.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 91ecb16..69cb53a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -2,7 +2,15 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.12 Release: 1%{?dist} -License: LGPLv2+ + +# most of the source code is LGPLv2+, except: +# datahub/ is LGPLv3+ +# examples/c/ is GPLv3 +# extensions/fts++/ is GPLv2+ +# src/notify.vala: GPLv2+ +# test/c/ is GPLv3 +# tools/zeitgeist-explorer/ is GPLv2+ +License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz @@ -36,6 +44,7 @@ together with several different user interfaces. %package libs Summary: Client library for interacting with the Zeitgeist daemon +License: LGPLv2+ %description libs Libzeitgeist is a client library for interacting with the Zeitgeist @@ -44,6 +53,7 @@ daemon. %package devel Summary: Development files for %{name} +License: LGPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -111,6 +121,7 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc - Update to 0.9.12 (#949286) - Obsolete zeitgeist-datahub - Package up the libzeitgeist-2.0 library +- Update the license tag and add a spec file comment with longer explanations * Fri Feb 15 2013 Fedora Release Engineering - 0.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 76b597dd050a7ae4e6dca70eb2862271027cf2b3 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Fri, 14 Jun 2013 01:32:53 -0400 Subject: [PATCH 22/91] Update to 0.9.13 --- .gitignore | 1 + sources | 2 +- zeitgeist.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2f801b..54a5334 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.0.tar.bz2 /zeitgeist-0.9.5.tar.bz2 /zeitgeist-0.9.12.tar.xz +/zeitgeist-0.9.13.tar.xz diff --git a/sources b/sources index 600eb4c..4e55bbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58488a7636a663a700be2b1d1a639e40 zeitgeist-0.9.12.tar.xz +796b35e817d59402b41da0d2bc1bcc3a zeitgeist-0.9.13.tar.xz diff --git a/zeitgeist.spec b/zeitgeist.spec index 69cb53a..ec78453 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} # most of the source code is LGPLv2+, except: @@ -69,7 +69,7 @@ developing applications that use %{name}. sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build -%configure --enable-fts +%configure --enable-fts --enable-datahub make %{?_smp_mflags} %install @@ -117,6 +117,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jun 14 2013 Deji Akingunola - 0.9.13-1 +- Update to 0.9.13 + * Sun Apr 14 2013 Kalev Lember - 0.9.12-1 - Update to 0.9.12 (#949286) - Obsolete zeitgeist-datahub From d64f3cf9adf0e30af246a92a151d7fb7ff97bad1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 16 Jun 2013 16:27:10 +0200 Subject: [PATCH 23/91] Fix %postun script syntax error --- zeitgeist.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index ec78453..deca3de 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -85,7 +85,6 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -#%files -f %{name}.lang %files %doc AUTHORS COPYING COPYING.GPL NEWS %{_bindir}/zeitgeist-daemon @@ -117,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Jun 16 2013 Kalev Lember - 0.9.13-2 +- Fix postun script syntax error + * Fri Jun 14 2013 Deji Akingunola - 0.9.13-1 - Update to 0.9.13 From 0894aebea6ce99be0d1e6bf58e00475b0ce44af5 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Tue, 9 Jul 2013 10:09:36 -0400 Subject: [PATCH 24/91] Update to 0.9.14. --- .gitignore | 1 + sources | 2 +- zeitgeist.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 54a5334..9fd9ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.5.tar.bz2 /zeitgeist-0.9.12.tar.xz /zeitgeist-0.9.13.tar.xz +/zeitgeist-0.9.14.tar.xz diff --git a/sources b/sources index 4e55bbe..d94cb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -796b35e817d59402b41da0d2bc1bcc3a zeitgeist-0.9.13.tar.xz +92371b864515389ffe7d70569f0bc9ed zeitgeist-0.9.14.tar.xz diff --git a/zeitgeist.spec b/zeitgeist.spec index deca3de..bdf42b2 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist -Version: 0.9.13 -Release: 2%{?dist} +Version: 0.9.14 +Release: 1%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Tue Jul 9 2013 Brian Pepple - 0.9.14-1 +- Update to 0.9.14. + * Sun Jun 16 2013 Kalev Lember - 0.9.13-2 - Fix postun script syntax error From 33d54a5786ef7f07031cc7084a923e92ce8d930e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:47:30 -0500 Subject: [PATCH 25/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index bdf42b2..7149d93 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.14 -Release: 1%{?dist} +Release: 2%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.9.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 9 2013 Brian Pepple - 0.9.14-1 - Update to 0.9.14. From f5d1c120cf5d366cd63ce405324b19fc72ff51c1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:05:27 -0500 Subject: [PATCH 26/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 7149d93..f8c7c86 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.14 -Release: 2%{?dist} +Release: 3%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.9.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From fb8267a5d29f7a1b458a25fc0885d39e4cd15d6c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 22 Jul 2014 20:41:02 +0200 Subject: [PATCH 27/91] Rebuilt for gobject-introspection 1.41.4 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index f8c7c86..19398ce 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.14 -Release: 3%{?dist} +Release: 4%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Tue Jul 22 2014 Kalev Lember - 0.9.14-4 +- Rebuilt for gobject-introspection 1.41.4 + * Sat Jun 07 2014 Fedora Release Engineering - 0.9.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From ae01a030573ac21ce25d84c61a79e662ce032096 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Fri, 8 Aug 2014 16:19:22 +0800 Subject: [PATCH 28/91] Update to 0.9.16(git snapshot), fixes BZ#1126461 --- .gitignore | 1 + 0001-Fix-unit-tests.patch | 60 ++++++++ ...ogs-with-warnings-that-aren-t-really.patch | 43 ++++++ ...bump-version-number-and-release-name.patch | 52 +++++++ ...-failure-if-XDG_DATA_DIRS-is-not-set.patch | 46 ++++++ 0005-Replace-with-1.patch | 27 ++++ ...-Add-a-missing-dependency-on-gio-2.0.patch | 22 +++ ...procs_conf-with-g_get_num_processors.patch | 49 ++++++ ...logy2code-don-t-hardcode-python-path.patch | 25 ++++ ...array-length-to-work-with-string.joi.patch | 29 ++++ ...5.4-according-to-the-usage-of-g_get_.patch | 140 ++++++++++++++++++ ...Drop-rogue-leading-unicode-character.patch | 22 +++ sources | 2 +- zeitgeist.spec | 124 +++++++++------- 14 files changed, 591 insertions(+), 51 deletions(-) create mode 100644 0001-Fix-unit-tests.patch create mode 100644 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch create mode 100644 0003-bump-version-number-and-release-name.patch create mode 100644 0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch create mode 100644 0005-Replace-with-1.patch create mode 100644 0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch create mode 100644 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch create mode 100644 0008-ontology2code-don-t-hardcode-python-path.patch create mode 100644 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch create mode 100644 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch create mode 100644 0012-tools-Drop-rogue-leading-unicode-character.patch diff --git a/.gitignore b/.gitignore index 9fd9ba8..ad8c004 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.12.tar.xz /zeitgeist-0.9.13.tar.xz /zeitgeist-0.9.14.tar.xz +/zeitgeist-0.9.16.20140808gitce9affa.tar.gz diff --git a/0001-Fix-unit-tests.patch b/0001-Fix-unit-tests.patch new file mode 100644 index 0000000..aa4dc47 --- /dev/null +++ b/0001-Fix-unit-tests.patch @@ -0,0 +1,60 @@ +From 42f0f6b0f17a584b703981b8a392c3225c7a8e98 Mon Sep 17 00:00:00 2001 +From: Seif Lotfy +Date: Thu, 2 Jan 2014 08:09:01 +0100 +Subject: [PATCH 01/12] Fix unit-tests + +Currently the unit tests failed when loading the xdg directories +and also it seems like optimizing the event variant lead to a +segfault when converting back via from_variant with several events +--- + libzeitgeist/event.vala | 4 ++-- + test/c/test-datasource.c | 3 +-- + test/c/test-event.c | 3 +-- + 3 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/libzeitgeist/event.vala b/libzeitgeist/event.vala +index 67fe47f..0cd708c 100644 +--- a/libzeitgeist/event.vala ++++ b/libzeitgeist/event.vala +@@ -292,8 +292,8 @@ public class Event : Object + } + + Variant event_variant = vb.end ().get_normal_form (); +- Variant ret = optimize_variant_allocation (event_variant); +- return ret; ++ //Variant ret = optimize_variant_allocation (event_variant); ++ return event_variant; + } + + private Variant optimize_variant_allocation (Variant event_variant) { +diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c +index a60d48b..067da55 100644 +--- a/test/c/test-datasource.c ++++ b/test/c/test-datasource.c +@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; + static void + setup (Fixture *fix, gconstpointer data) + { +- if (old_xdg_data_dirs != NULL) +- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); ++ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); + } + +diff --git a/test/c/test-event.c b/test/c/test-event.c +index 746de3d..440d3c3 100644 +--- a/test/c/test-event.c ++++ b/test/c/test-event.c +@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; + static void + setup (Fixture *fix, gconstpointer data) + { +- if (old_xdg_data_dirs != NULL) +- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); ++ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); + } + +-- +2.0.4 + diff --git a/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch b/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch new file mode 100644 index 0000000..f3e9839 --- /dev/null +++ b/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch @@ -0,0 +1,43 @@ +From c753eed33a0d5d7c7869cb9c75bfab0fccba51c5 Mon Sep 17 00:00:00 2001 +From: William Jon McCann +Date: Fri, 3 Jan 2014 16:27:21 -0500 +Subject: [PATCH 02/12] Don't spam the logs with warnings that aren't really + warnings + +Use debug instead + +Signed-off-by: Seif Lotfy +--- + datahub/recent-manager-provider.vala | 2 +- + datahub/utils.vala | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/datahub/recent-manager-provider.vala b/datahub/recent-manager-provider.vala +index 810ed6a..67a4808 100644 +--- a/datahub/recent-manager-provider.vala ++++ b/datahub/recent-manager-provider.vala +@@ -129,7 +129,7 @@ public class RecentManagerGtk : DataProvider + + if (desktop_file == null) + { +- warning ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s", ++ debug ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s", + uri, exec[0], ri.get_mime_type ()); + continue; // this makes us sad panda + } +diff --git a/datahub/utils.vala b/datahub/utils.vala +index bd14e45..b914636 100644 +--- a/datahub/utils.vala ++++ b/datahub/utils.vala +@@ -44,7 +44,7 @@ public class Utils : Object + } + catch (Error err) + { +- warning ("Couldn't get file contents %s: %s", file.get_path (), err.message); ++ debug ("Couldn't get file contents %s: %s", file.get_path (), err.message); + } + contents = (string) contents_array; + #else +-- +2.0.4 + diff --git a/0003-bump-version-number-and-release-name.patch b/0003-bump-version-number-and-release-name.patch new file mode 100644 index 0000000..8eb4afa --- /dev/null +++ b/0003-bump-version-number-and-release-name.patch @@ -0,0 +1,52 @@ +From c1873620ad2d83af3e87dd82fdcf56b5e70a27ce Mon Sep 17 00:00:00 2001 +From: Seif Lotfy +Date: Wed, 15 Jan 2014 08:16:03 +0100 +Subject: [PATCH 03/12] bump version number and release name + +--- + NEWS | 12 +++++++++++- + configure.ac | 4 ++-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index e6f3352..15eb582 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,4 +1,14 @@ +-2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond" ++2014-01-15: Zeitgeist 0.9.15 (1.0 Beta 7) "Bazooka" ++--------------------------------------------------------------- ++ ++Libzeitgeist: ++ - Fix converting variants to event lists ++ ++Datahub: ++ - change some warnings to debugs ++ ++ ++2013-06-30: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond" + --------------------------------------------------------------- + + Libzeitgeist: +diff --git a/configure.ac b/configure.ac +index d244420..acf7daa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,4 +1,4 @@ +-AC_INIT([zeitgeist], [0.9.14], [dev@lists.zeitgeist-project.com], [zeitgeist]) ++AC_INIT([zeitgeist], [0.9.15], [dev@lists.zeitgeist-project.com], [zeitgeist]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS(config.h) +@@ -13,7 +13,7 @@ AC_PROG_CXX + AC_DISABLE_STATIC + AC_PROG_LIBTOOL + +-AM_PROG_VALAC([0.20.0]) ++AM_PROG_VALAC([0.22.0]) + AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])]) + + AM_SILENT_RULES([yes]) +-- +2.0.4 + diff --git a/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch b/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch new file mode 100644 index 0000000..557fa1c --- /dev/null +++ b/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch @@ -0,0 +1,46 @@ +From b25d01246371ba0688fee6baa718e50c22d861c2 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 15 Jan 2014 08:36:47 +0100 +Subject: [PATCH 04/12] Fix unit test failure if $XDG_DATA_DIRS is not set + +In that case g_setenv() would fail trying to set a NULL value in teardown. + +https://bugs.freedesktop.org/show_bug.cgi?id=73651 + +Signed-off-by: Seif Lotfy +--- + test/c/test-datasource.c | 3 ++- + test/c/test-event.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c +index 067da55..3e3ce01 100644 +--- a/test/c/test-datasource.c ++++ b/test/c/test-datasource.c +@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data) + static void + teardown (Fixture *fix, gconstpointer data) + { +- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); ++ if (old_xdg_data_dirs != NULL) ++ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); + } + + static void +diff --git a/test/c/test-event.c b/test/c/test-event.c +index 440d3c3..abd7718 100644 +--- a/test/c/test-event.c ++++ b/test/c/test-event.c +@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data) + static void + teardown (Fixture *fix, gconstpointer data) + { +- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); ++ if (old_xdg_data_dirs != NULL) ++ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); + } + + static void +-- +2.0.4 + diff --git a/0005-Replace-with-1.patch b/0005-Replace-with-1.patch new file mode 100644 index 0000000..3e106c3 --- /dev/null +++ b/0005-Replace-with-1.patch @@ -0,0 +1,27 @@ +From 74387d7e1eab84323ca4615caa955bdb5bbe7170 Mon Sep 17 00:00:00 2001 +From: Seif Lotfy +Date: Mon, 27 Jan 2014 22:45:42 +0100 +Subject: [PATCH 05/12] Replace \+ with \{1,\) + +This command /usr/bin/sed -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la +does not work on FreeBSD because \+ is not in basic regular expression. +--- + libzeitgeist/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am +index 67e9563..f44e950 100644 +--- a/libzeitgeist/Makefile.am ++++ b/libzeitgeist/Makefile.am +@@ -186,7 +186,7 @@ MAINTAINERCLEANFILES = + # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002. + # This is what g-ir-scanner does. + libzeitgeist_dlname = \ +- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la` ++ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la` + + if HAVE_INTROSPECTION + libzeitgeist_2_0_gir_VALASOURCES = \ +-- +2.0.4 + diff --git a/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch b/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch new file mode 100644 index 0000000..9dbeab9 --- /dev/null +++ b/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch @@ -0,0 +1,22 @@ +From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Sun, 16 Feb 2014 15:08:49 +0000 +Subject: [PATCH 06/12] libzeitgeist: Add a missing dependency on gio-2.0 + +This actually makes the zeitgeist vapi file usable. + +Signed-off-by: Seif Lotfy +--- + libzeitgeist/zeitgeist-2.0.deps | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps +index ff8d39b..59eec5d 100644 +--- a/libzeitgeist/zeitgeist-2.0.deps ++++ b/libzeitgeist/zeitgeist-2.0.deps +@@ -1 +1,2 @@ + zeitgeist-datamodel-2.0 ++gio-2.0 +-- +2.0.4 + diff --git a/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch b/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch new file mode 100644 index 0000000..4df9433 --- /dev/null +++ b/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch @@ -0,0 +1,49 @@ +From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001 +From: Seif Lotfy +Date: Tue, 4 Mar 2014 20:55:53 +0100 +Subject: [PATCH 07/12] Replace get_nprocs_conf with g_get_num_processors() + +--- + libzeitgeist/log.vala | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala +index 02b16ca..f0b65cb 100644 +--- a/libzeitgeist/log.vala ++++ b/libzeitgeist/log.vala +@@ -40,6 +40,7 @@ + * Zeitgeist also comes with a blacklist extension to make sure the user + * always stays in control of what information is logged. + */ ++ + namespace Zeitgeist + { + +@@ -58,8 +59,8 @@ namespace Zeitgeist + */ + public class Log : QueuedProxyWrapper + { +- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")] +- extern static int get_nprocs_conf (); ++ [CCode (cname = "g_get_num_processors")] ++ private extern static uint get_num_processors (); + + class DbWorker + { +@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper + try { + threads = new ThreadPool.with_owned_data ((worker) => { + worker.run (); +- }, get_nprocs_conf (), true); ++ }, (int) get_num_processors (), true); + } catch (ThreadError err) { + warning ("%s", err.message); + threads = null; +@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper + + } + +-// vim:expandtab:ts=4:sw=4 +-- +2.0.4 + diff --git a/0008-ontology2code-don-t-hardcode-python-path.patch b/0008-ontology2code-don-t-hardcode-python-path.patch new file mode 100644 index 0000000..052e249 --- /dev/null +++ b/0008-ontology2code-don-t-hardcode-python-path.patch @@ -0,0 +1,25 @@ +From d36d90fd0366b84c2e466963c49ad4b48ca740cb Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Sat, 15 Mar 2014 11:40:10 -0400 +Subject: [PATCH 08/12] ontology2code: don't hardcode python path + +Use the typical /usr/bin/env trick to find python. + +https://bugs.freedesktop.org/show_bug.cgi?id=73837 +--- + data/ontology2code | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/ontology2code b/data/ontology2code +index 988e711..b8efbfd 100755 +--- a/data/ontology2code ++++ b/data/ontology2code +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + # -.- coding: utf-8 -.- + + # Zeitgeist +-- +2.0.4 + diff --git a/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch b/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch new file mode 100644 index 0000000..2687daf --- /dev/null +++ b/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch @@ -0,0 +1,29 @@ +From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Mon, 17 Mar 2014 20:57:49 +0100 +Subject: [PATCH 10/12] WhereClause: Fix array-length to work with string.joinv + of vala-0.24 + +--- + libzeitgeist/where-clause.vala | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala +index a830599..d981914 100644 +--- a/libzeitgeist/where-clause.vala ++++ b/libzeitgeist/where-clause.vala +@@ -211,7 +211,11 @@ namespace Zeitgeist + */ + private T[] generic_array_to_unowned_array (GenericArray gptrarr) + { ++#if VALA_0_24 ++ long[] pointers = new long[gptrarr.length]; ++#else + long[] pointers = new long[gptrarr.length + 1]; ++#endif + Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, + (gptrarr.length) * sizeof (void *)); + return (T[]) pointers; +-- +2.0.4 + diff --git a/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch b/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch new file mode 100644 index 0000000..3e5bf4f --- /dev/null +++ b/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch @@ -0,0 +1,140 @@ +From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Mon, 17 Mar 2014 21:02:01 +0100 +Subject: [PATCH 11/12] Require glib >= 2.35.4 according to the usage of + g_get_num_processors() + +Bump vala buildflags accordingly +--- + configure.ac | 2 +- + datahub/Makefile.am | 2 +- + examples/vala/Makefile.am | 2 +- + extensions/Makefile.am | 2 +- + extensions/fts++/Makefile.am | 2 +- + libzeitgeist/Makefile.am | 2 +- + libzeitgeist/log.vala | 3 --- + src/Makefile.am | 2 +- + test/direct/Makefile.am | 2 +- + 9 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index acf7daa..45f50c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ AC_SUBST(CFLAGS) + AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) + +-GLIB_REQUIRED=2.26.0 ++GLIB_REQUIRED=2.35.4 + SQLITE_REQUIRED=3.7.11 + VALADOC_REQUIRED=0.2 + +diff --git a/datahub/Makefile.am b/datahub/Makefile.am +index 9629baa..19bcb3b 100644 +--- a/datahub/Makefile.am ++++ b/datahub/Makefile.am +@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg gtk+-3.0 \ +diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am +index 99584e6..b7cd7c2 100644 +--- a/examples/vala/Makefile.am ++++ b/examples/vala/Makefile.am +@@ -8,7 +8,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \ + $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \ +diff --git a/extensions/Makefile.am b/extensions/Makefile.am +index 20139aa..72b9e24 100644 +--- a/extensions/Makefile.am ++++ b/extensions/Makefile.am +@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg sqlite3 \ + --pkg gmodule-2.0 \ +diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am +index 8bd9936..0ebf206 100644 +--- a/extensions/fts++/Makefile.am ++++ b/extensions/fts++/Makefile.am +@@ -21,7 +21,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg sqlite3 \ + --pkg posix \ +diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am +index f44e950..9af0cb4 100644 +--- a/libzeitgeist/Makefile.am ++++ b/libzeitgeist/Makefile.am +@@ -27,7 +27,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg sqlite3 \ +diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala +index f0b65cb..3de1c7d 100644 +--- a/libzeitgeist/log.vala ++++ b/libzeitgeist/log.vala +@@ -59,9 +59,6 @@ namespace Zeitgeist + */ + public class Log : QueuedProxyWrapper + { +- [CCode (cname = "g_get_num_processors")] +- private extern static uint get_num_processors (); +- + class DbWorker + { + private unowned ThreadFunc func; +diff --git a/src/Makefile.am b/src/Makefile.am +index 3deb6c2..65751ef 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg sqlite3 \ + --pkg posix \ +diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am +index 80279d4..59e9f5f 100644 +--- a/test/direct/Makefile.am ++++ b/test/direct/Makefile.am +@@ -8,7 +8,7 @@ EXTRA_DIST = \ + $(NULL) + + AM_VALAFLAGS = \ +- --target-glib=2.26 \ ++ --target-glib=2.36 \ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg sqlite3 \ +-- +2.0.4 + diff --git a/0012-tools-Drop-rogue-leading-unicode-character.patch b/0012-tools-Drop-rogue-leading-unicode-character.patch new file mode 100644 index 0000000..c9d0365 --- /dev/null +++ b/0012-tools-Drop-rogue-leading-unicode-character.patch @@ -0,0 +1,22 @@ +From ce9affa87a8775ef4c45d7508d1b519319b9162a Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 3 Jul 2014 09:39:05 +0200 +Subject: [PATCH 12/12] tools: Drop rogue leading unicode character + +--- + tools/development/cairoplot.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/development/cairoplot.py b/tools/development/cairoplot.py +index b39f765..8b1c564 100644 +--- a/tools/development/cairoplot.py ++++ b/tools/development/cairoplot.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python + # -*- coding: utf-8 -*- + + # CairoPlot.py +-- +2.0.4 + diff --git a/sources b/sources index d94cb6a..06e3129 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92371b864515389ffe7d70569f0bc9ed zeitgeist-0.9.14.tar.xz +99eec45dbf698b7a1a3b0c7ceb1972ef zeitgeist-0.9.16.20140808gitce9affa.tar.gz diff --git a/zeitgeist.spec b/zeitgeist.spec index 19398ce..f227cab 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,8 +1,7 @@ -Summary: Framework providing Desktop activity awareness -Name: zeitgeist -Version: 0.9.14 -Release: 4%{?dist} - +Name: zeitgeist +Version: 0.9.16 +Release: 0.1.20140808.git.ce9affa%{?dist} +Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ # examples/c/ is GPLv3 @@ -10,79 +9,100 @@ Release: 4%{?dist} # src/notify.vala: GPLv2+ # test/c/ is GPLv3 # tools/zeitgeist-explorer/ is GPLv2+ -License: LGPLv2+ and LGPLv3+ and GPLv2+ -URL: https://launchpad.net/zeitgeist -Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz - -BuildRequires: dbus-devel -BuildRequires: gettext -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel -BuildRequires: intltool -BuildRequires: json-glib-devel -BuildRequires: python-devel -BuildRequires: python-rdflib -BuildRequires: raptor2 -BuildRequires: sqlite-devel -BuildRequires: telepathy-glib-devel -BuildRequires: vala -BuildRequires: xapian-core-devel -Requires: dbus -Requires: dbus-python - -Obsoletes: zeitgeist-datahub < 0.9.10 +License: LGPLv2+ and LGPLv3+ and GPLv2+ +URL: http://zeitgeist-project.com/ +Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-0.9.14.tar.xz +#Source0: zeitgeist-0.9.16.20140808gitce9affa.tar.gz +Patch0: 0001-Fix-unit-tests.patch +Patch1: 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch +Patch2: 0003-bump-version-number-and-release-name.patch +Patch3: 0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch +Patch4: 0005-Replace-with-1.patch +Patch5: 0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch +Patch6: 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch +Patch7: 0008-ontology2code-don-t-hardcode-python-path.patch +Patch8: 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch +Patch9: 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch +Patch10: 0012-tools-Drop-rogue-leading-unicode-character.patch +BuildRequires: dbus-devel +BuildRequires: dee-devel +BuildRequires: gettext +BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel +BuildRequires: intltool +BuildRequires: json-glib-devel +BuildRequires: python2-devel +BuildRequires: python-rdflib +BuildRequires: raptor2 +BuildRequires: sqlite-devel +BuildRequires: telepathy-glib-devel +BuildRequires: vala +BuildRequires: xapian-core-devel +Requires: dbus +Requires: dbus-python +Obsoletes: zeitgeist-datahub < 0.9.10 %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 -relevant information available to other applications. +opened, websites visites, conversations hold with other people, etc.) and +makes relevant information available to other applications. Note that this package only contains the daemon, which you can use together with several different user interfaces. +%package libs +Summary: Client library for interacting with the Zeitgeist daemon +License: LGPLv2+ -%package libs -Summary: Client library for interacting with the Zeitgeist daemon -License: LGPLv2+ - -%description libs +%description libs Libzeitgeist is a client library for interacting with the Zeitgeist daemon. +%package devel +Summary: Development files for %{name} +License: LGPLv2+ +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%package devel -Summary: Development files for %{name} -License: LGPLv2+ -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for +%description devel +This package contains libraries and header files for developing applications that use %{name}. - %prep -%setup -q +%setup -qn %{name}-0.9.14 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -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 --enable-fts --enable-datahub -make %{?_smp_mflags} +%configure --enable-fts --enable-datahub --disable-silent-rules +%make_build %install -make DESTDIR=%{buildroot} install +%make_install -rm -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -name '*.la' -delete -print # We install AUTHORS and NEWS with %%doc instead -rm -rf %{buildroot}%{_datadir}/zeitgeist/doc +rm -frv %{buildroot}%{_datadir}/zeitgeist/doc -#%find_lang %{name} +%check +make check || true %post libs -p /sbin/ldconfig + %postun libs -p /sbin/ldconfig %files @@ -91,7 +111,7 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_bindir}/zeitgeist-datahub %{_libexecdir}/zeitgeist-fts %{_datadir}/%{name}/ -%{python_sitelib}/zeitgeist/ +%{python2_sitelib}/zeitgeist/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions @@ -116,6 +136,10 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Aug 08 2014 Christopher Meng - 0.9.16-0.1.20140808.git.ce9affa +- Update to 0.9.16 snapshot +- Fix BZ#1126461 + * Tue Jul 22 2014 Kalev Lember - 0.9.14-4 - Rebuilt for gobject-introspection 1.41.4 From 7f6c3ef79694d8c0bcb8c429530d39971ed0f15e Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Fri, 8 Aug 2014 16:29:34 +0800 Subject: [PATCH 29/91] Revert back the sources as I'd like to use VCS patches. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 06e3129..d94cb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99eec45dbf698b7a1a3b0c7ceb1972ef zeitgeist-0.9.16.20140808gitce9affa.tar.gz +92371b864515389ffe7d70569f0bc9ed zeitgeist-0.9.14.tar.xz From d0dc33492a5166c5aa54431403c66503d63679cc Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 12 Aug 2014 11:58:41 +0800 Subject: [PATCH 30/91] - Introduce python-zeitgeist subpkg - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 --- zeitgeist.spec | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index f227cab..79c4f7f 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 0.1.20140808.git.ce9affa%{?dist} +Release: 0.2.20140808.git.ce9affa%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -12,7 +12,6 @@ Summary: Framework providing Desktop activity awareness License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: http://zeitgeist-project.com/ Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-0.9.14.tar.xz -#Source0: zeitgeist-0.9.16.20140808gitce9affa.tar.gz Patch0: 0001-Fix-unit-tests.patch Patch1: 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch Patch2: 0003-bump-version-number-and-release-name.patch @@ -23,7 +22,7 @@ Patch6: 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch Patch7: 0008-ontology2code-don-t-hardcode-python-path.patch Patch8: 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch Patch9: 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch -Patch10: 0012-tools-Drop-rogue-leading-unicode-character.patch +Patch10: 0012-tools-Drop-rogue-leading-unicode-character.patch BuildRequires: dbus-devel BuildRequires: dee-devel BuildRequires: gettext @@ -40,8 +39,8 @@ BuildRequires: telepathy-glib-devel BuildRequires: vala BuildRequires: xapian-core-devel Requires: dbus -Requires: dbus-python -Obsoletes: zeitgeist-datahub < 0.9.10 +Requires: python-%{name} = %{version}-%{release} +Obsoletes: zeitgeist-datahub < 0.9.5-4 %description Zeitgeist is a service which logs the users's activities and events (files @@ -68,6 +67,17 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} This package contains libraries and header files for developing applications that use %{name}. +%package -n python-%{name} +Summary: Python 2 bindings for %{name} +BuildArch: noarch +Requires: dbus-python +Requires: pyxdg +Requires: %{name} = %{version}-%{release} + +%description -n python-%{name} +This package contains Python 2 API for +developing applications that use %{name}. + %prep %setup -qn %{name}-0.9.14 %patch0 -p1 @@ -111,13 +121,12 @@ make check || true %{_bindir}/zeitgeist-datahub %{_libexecdir}/zeitgeist-fts %{_datadir}/%{name}/ -%{python2_sitelib}/zeitgeist/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/zeitgeist-daemon %{_mandir}/man1/zeitgeist-*.* -%{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop %files libs %doc COPYING @@ -135,7 +144,14 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-2.0.vapi %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi +%files -n python-%{name} +%{python2_sitelib}/zeitgeist/ + %changelog +* Tue Aug 12 2014 Christopher Meng - 0.9.16-0.2.20140808.git.ce9affa +- Introduce python-zeitgeist subpkg +- Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 + * Fri Aug 08 2014 Christopher Meng - 0.9.16-0.1.20140808.git.ce9affa - Update to 0.9.16 snapshot - Fix BZ#1126461 From 441ba847e18b4f5a272fb8d2ffe58750a6781cd4 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 12 Aug 2014 12:04:18 +0800 Subject: [PATCH 31/91] Fix email address. --- zeitgeist.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 79c4f7f..d4d6a3d 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -148,11 +148,11 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog -* Tue Aug 12 2014 Christopher Meng - 0.9.16-0.2.20140808.git.ce9affa +* Tue Aug 12 2014 Christopher Meng - 0.9.16-0.2.20140808.git.ce9affa - Introduce python-zeitgeist subpkg - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 -* Fri Aug 08 2014 Christopher Meng - 0.9.16-0.1.20140808.git.ce9affa +* Fri Aug 08 2014 Christopher Meng - 0.9.16-0.1.20140808.git.ce9affa - Update to 0.9.16 snapshot - Fix BZ#1126461 From e5b700eaefd9d4d59061a118388791a259214275 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:34:05 +0000 Subject: [PATCH 32/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index d4d6a3d..0f63eb7 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 0.2.20140808.git.ce9affa%{?dist} +Release: 0.3.20140808.git.ce9affa%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -148,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.9.16-0.3.20140808.git.ce9affa +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Aug 12 2014 Christopher Meng - 0.9.16-0.2.20140808.git.ce9affa - Introduce python-zeitgeist subpkg - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 From 9cc9263c3df932b5928457f5d36dde69c8b82d2f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:51:30 +0200 Subject: [PATCH 33/91] Rebuilt for GCC 5 C++11 ABI change --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 0f63eb7..60d3e9a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 0.3.20140808.git.ce9affa%{?dist} +Release: 0.4.20140808.git.ce9affa%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -148,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sat May 02 2015 Kalev Lember - 0.9.16-0.4.20140808.git.ce9affa +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 0.9.16-0.3.20140808.git.ce9affa - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 41a3e6a1d1ca838201d0121364019759a56f29b4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:45:14 +0000 Subject: [PATCH 34/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 60d3e9a..5468933 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 0.4.20140808.git.ce9affa%{?dist} +Release: 0.5.20140808.git.ce9affa%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -148,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.9.16-0.5.20140808.git.ce9affa +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 0.9.16-0.4.20140808.git.ce9affa - Rebuilt for GCC 5 C++11 ABI change From 5f955a8c37dc6be28372638beb28079ee1f2fce3 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 27 Aug 2015 12:29:43 +0800 Subject: [PATCH 35/91] Update to 0.9.16 --- .gitignore | 1 + 0001-Fix-unit-tests.patch | 60 -------- ...ogs-with-warnings-that-aren-t-really.patch | 43 ------ ...bump-version-number-and-release-name.patch | 52 ------- ...-failure-if-XDG_DATA_DIRS-is-not-set.patch | 46 ------ 0005-Replace-with-1.patch | 27 ---- ...-Add-a-missing-dependency-on-gio-2.0.patch | 22 --- ...procs_conf-with-g_get_num_processors.patch | 49 ------ ...logy2code-don-t-hardcode-python-path.patch | 25 ---- ...array-length-to-work-with-string.joi.patch | 29 ---- ...5.4-according-to-the-usage-of-g_get_.patch | 140 ------------------ ...Drop-rogue-leading-unicode-character.patch | 22 --- sources | 2 +- zeitgeist.spec | 36 ++--- 14 files changed, 11 insertions(+), 543 deletions(-) delete mode 100644 0001-Fix-unit-tests.patch delete mode 100644 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch delete mode 100644 0003-bump-version-number-and-release-name.patch delete mode 100644 0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch delete mode 100644 0005-Replace-with-1.patch delete mode 100644 0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch delete mode 100644 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch delete mode 100644 0008-ontology2code-don-t-hardcode-python-path.patch delete mode 100644 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch delete mode 100644 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch delete mode 100644 0012-tools-Drop-rogue-leading-unicode-character.patch diff --git a/.gitignore b/.gitignore index ad8c004..840b6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.13.tar.xz /zeitgeist-0.9.14.tar.xz /zeitgeist-0.9.16.20140808gitce9affa.tar.gz +/zeitgeist-0.9.16.tar.xz diff --git a/0001-Fix-unit-tests.patch b/0001-Fix-unit-tests.patch deleted file mode 100644 index aa4dc47..0000000 --- a/0001-Fix-unit-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 42f0f6b0f17a584b703981b8a392c3225c7a8e98 Mon Sep 17 00:00:00 2001 -From: Seif Lotfy -Date: Thu, 2 Jan 2014 08:09:01 +0100 -Subject: [PATCH 01/12] Fix unit-tests - -Currently the unit tests failed when loading the xdg directories -and also it seems like optimizing the event variant lead to a -segfault when converting back via from_variant with several events ---- - libzeitgeist/event.vala | 4 ++-- - test/c/test-datasource.c | 3 +-- - test/c/test-event.c | 3 +-- - 3 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/libzeitgeist/event.vala b/libzeitgeist/event.vala -index 67fe47f..0cd708c 100644 ---- a/libzeitgeist/event.vala -+++ b/libzeitgeist/event.vala -@@ -292,8 +292,8 @@ public class Event : Object - } - - Variant event_variant = vb.end ().get_normal_form (); -- Variant ret = optimize_variant_allocation (event_variant); -- return ret; -+ //Variant ret = optimize_variant_allocation (event_variant); -+ return event_variant; - } - - private Variant optimize_variant_allocation (Variant event_variant) { -diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c -index a60d48b..067da55 100644 ---- a/test/c/test-datasource.c -+++ b/test/c/test-datasource.c -@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; - static void - setup (Fixture *fix, gconstpointer data) - { -- if (old_xdg_data_dirs != NULL) -- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); -+ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); - } - -diff --git a/test/c/test-event.c b/test/c/test-event.c -index 746de3d..440d3c3 100644 ---- a/test/c/test-event.c -+++ b/test/c/test-event.c -@@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; - static void - setup (Fixture *fix, gconstpointer data) - { -- if (old_xdg_data_dirs != NULL) -- old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); -+ old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); - } - --- -2.0.4 - diff --git a/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch b/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch deleted file mode 100644 index f3e9839..0000000 --- a/0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c753eed33a0d5d7c7869cb9c75bfab0fccba51c5 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Fri, 3 Jan 2014 16:27:21 -0500 -Subject: [PATCH 02/12] Don't spam the logs with warnings that aren't really - warnings - -Use debug instead - -Signed-off-by: Seif Lotfy ---- - datahub/recent-manager-provider.vala | 2 +- - datahub/utils.vala | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/datahub/recent-manager-provider.vala b/datahub/recent-manager-provider.vala -index 810ed6a..67a4808 100644 ---- a/datahub/recent-manager-provider.vala -+++ b/datahub/recent-manager-provider.vala -@@ -129,7 +129,7 @@ public class RecentManagerGtk : DataProvider - - if (desktop_file == null) - { -- warning ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s", -+ debug ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s", - uri, exec[0], ri.get_mime_type ()); - continue; // this makes us sad panda - } -diff --git a/datahub/utils.vala b/datahub/utils.vala -index bd14e45..b914636 100644 ---- a/datahub/utils.vala -+++ b/datahub/utils.vala -@@ -44,7 +44,7 @@ public class Utils : Object - } - catch (Error err) - { -- warning ("Couldn't get file contents %s: %s", file.get_path (), err.message); -+ debug ("Couldn't get file contents %s: %s", file.get_path (), err.message); - } - contents = (string) contents_array; - #else --- -2.0.4 - diff --git a/0003-bump-version-number-and-release-name.patch b/0003-bump-version-number-and-release-name.patch deleted file mode 100644 index 8eb4afa..0000000 --- a/0003-bump-version-number-and-release-name.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c1873620ad2d83af3e87dd82fdcf56b5e70a27ce Mon Sep 17 00:00:00 2001 -From: Seif Lotfy -Date: Wed, 15 Jan 2014 08:16:03 +0100 -Subject: [PATCH 03/12] bump version number and release name - ---- - NEWS | 12 +++++++++++- - configure.ac | 4 ++-- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/NEWS b/NEWS -index e6f3352..15eb582 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,4 +1,14 @@ --2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond" -+2014-01-15: Zeitgeist 0.9.15 (1.0 Beta 7) "Bazooka" -+--------------------------------------------------------------- -+ -+Libzeitgeist: -+ - Fix converting variants to event lists -+ -+Datahub: -+ - change some warnings to debugs -+ -+ -+2013-06-30: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond" - --------------------------------------------------------------- - - Libzeitgeist: -diff --git a/configure.ac b/configure.ac -index d244420..acf7daa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT([zeitgeist], [0.9.14], [dev@lists.zeitgeist-project.com], [zeitgeist]) -+AC_INIT([zeitgeist], [0.9.15], [dev@lists.zeitgeist-project.com], [zeitgeist]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_HEADERS(config.h) -@@ -13,7 +13,7 @@ AC_PROG_CXX - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - --AM_PROG_VALAC([0.20.0]) -+AM_PROG_VALAC([0.22.0]) - AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])]) - - AM_SILENT_RULES([yes]) --- -2.0.4 - diff --git a/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch b/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch deleted file mode 100644 index 557fa1c..0000000 --- a/0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b25d01246371ba0688fee6baa718e50c22d861c2 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Wed, 15 Jan 2014 08:36:47 +0100 -Subject: [PATCH 04/12] Fix unit test failure if $XDG_DATA_DIRS is not set - -In that case g_setenv() would fail trying to set a NULL value in teardown. - -https://bugs.freedesktop.org/show_bug.cgi?id=73651 - -Signed-off-by: Seif Lotfy ---- - test/c/test-datasource.c | 3 ++- - test/c/test-event.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c -index 067da55..3e3ce01 100644 ---- a/test/c/test-datasource.c -+++ b/test/c/test-datasource.c -@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data) - static void - teardown (Fixture *fix, gconstpointer data) - { -- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); -+ if (old_xdg_data_dirs != NULL) -+ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); - } - - static void -diff --git a/test/c/test-event.c b/test/c/test-event.c -index 440d3c3..abd7718 100644 ---- a/test/c/test-event.c -+++ b/test/c/test-event.c -@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data) - static void - teardown (Fixture *fix, gconstpointer data) - { -- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); -+ if (old_xdg_data_dirs != NULL) -+ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE); - } - - static void --- -2.0.4 - diff --git a/0005-Replace-with-1.patch b/0005-Replace-with-1.patch deleted file mode 100644 index 3e106c3..0000000 --- a/0005-Replace-with-1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 74387d7e1eab84323ca4615caa955bdb5bbe7170 Mon Sep 17 00:00:00 2001 -From: Seif Lotfy -Date: Mon, 27 Jan 2014 22:45:42 +0100 -Subject: [PATCH 05/12] Replace \+ with \{1,\) - -This command /usr/bin/sed -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la -does not work on FreeBSD because \+ is not in basic regular expression. ---- - libzeitgeist/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am -index 67e9563..f44e950 100644 ---- a/libzeitgeist/Makefile.am -+++ b/libzeitgeist/Makefile.am -@@ -186,7 +186,7 @@ MAINTAINERCLEANFILES = - # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002. - # This is what g-ir-scanner does. - libzeitgeist_dlname = \ -- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la` -+ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la` - - if HAVE_INTROSPECTION - libzeitgeist_2_0_gir_VALASOURCES = \ --- -2.0.4 - diff --git a/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch b/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch deleted file mode 100644 index 9dbeab9..0000000 --- a/0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Sun, 16 Feb 2014 15:08:49 +0000 -Subject: [PATCH 06/12] libzeitgeist: Add a missing dependency on gio-2.0 - -This actually makes the zeitgeist vapi file usable. - -Signed-off-by: Seif Lotfy ---- - libzeitgeist/zeitgeist-2.0.deps | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps -index ff8d39b..59eec5d 100644 ---- a/libzeitgeist/zeitgeist-2.0.deps -+++ b/libzeitgeist/zeitgeist-2.0.deps -@@ -1 +1,2 @@ - zeitgeist-datamodel-2.0 -+gio-2.0 --- -2.0.4 - diff --git a/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch b/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch deleted file mode 100644 index 4df9433..0000000 --- a/0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001 -From: Seif Lotfy -Date: Tue, 4 Mar 2014 20:55:53 +0100 -Subject: [PATCH 07/12] Replace get_nprocs_conf with g_get_num_processors() - ---- - libzeitgeist/log.vala | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala -index 02b16ca..f0b65cb 100644 ---- a/libzeitgeist/log.vala -+++ b/libzeitgeist/log.vala -@@ -40,6 +40,7 @@ - * Zeitgeist also comes with a blacklist extension to make sure the user - * always stays in control of what information is logged. - */ -+ - namespace Zeitgeist - { - -@@ -58,8 +59,8 @@ namespace Zeitgeist - */ - public class Log : QueuedProxyWrapper - { -- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")] -- extern static int get_nprocs_conf (); -+ [CCode (cname = "g_get_num_processors")] -+ private extern static uint get_num_processors (); - - class DbWorker - { -@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper - try { - threads = new ThreadPool.with_owned_data ((worker) => { - worker.run (); -- }, get_nprocs_conf (), true); -+ }, (int) get_num_processors (), true); - } catch (ThreadError err) { - warning ("%s", err.message); - threads = null; -@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper - - } - --// vim:expandtab:ts=4:sw=4 --- -2.0.4 - diff --git a/0008-ontology2code-don-t-hardcode-python-path.patch b/0008-ontology2code-don-t-hardcode-python-path.patch deleted file mode 100644 index 052e249..0000000 --- a/0008-ontology2code-don-t-hardcode-python-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d36d90fd0366b84c2e466963c49ad4b48ca740cb Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Sat, 15 Mar 2014 11:40:10 -0400 -Subject: [PATCH 08/12] ontology2code: don't hardcode python path - -Use the typical /usr/bin/env trick to find python. - -https://bugs.freedesktop.org/show_bug.cgi?id=73837 ---- - data/ontology2code | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/ontology2code b/data/ontology2code -index 988e711..b8efbfd 100755 ---- a/data/ontology2code -+++ b/data/ontology2code -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#! /usr/bin/env python - # -.- coding: utf-8 -.- - - # Zeitgeist --- -2.0.4 - diff --git a/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch b/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch deleted file mode 100644 index 2687daf..0000000 --- a/0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Mon, 17 Mar 2014 20:57:49 +0100 -Subject: [PATCH 10/12] WhereClause: Fix array-length to work with string.joinv - of vala-0.24 - ---- - libzeitgeist/where-clause.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala -index a830599..d981914 100644 ---- a/libzeitgeist/where-clause.vala -+++ b/libzeitgeist/where-clause.vala -@@ -211,7 +211,11 @@ namespace Zeitgeist - */ - private T[] generic_array_to_unowned_array (GenericArray gptrarr) - { -+#if VALA_0_24 -+ long[] pointers = new long[gptrarr.length]; -+#else - long[] pointers = new long[gptrarr.length + 1]; -+#endif - Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, - (gptrarr.length) * sizeof (void *)); - return (T[]) pointers; --- -2.0.4 - diff --git a/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch b/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch deleted file mode 100644 index 3e5bf4f..0000000 --- a/0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch +++ /dev/null @@ -1,140 +0,0 @@ -From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Mon, 17 Mar 2014 21:02:01 +0100 -Subject: [PATCH 11/12] Require glib >= 2.35.4 according to the usage of - g_get_num_processors() - -Bump vala buildflags accordingly ---- - configure.ac | 2 +- - datahub/Makefile.am | 2 +- - examples/vala/Makefile.am | 2 +- - extensions/Makefile.am | 2 +- - extensions/fts++/Makefile.am | 2 +- - libzeitgeist/Makefile.am | 2 +- - libzeitgeist/log.vala | 3 --- - src/Makefile.am | 2 +- - test/direct/Makefile.am | 2 +- - 9 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index acf7daa..45f50c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_SUBST(CFLAGS) - AC_SUBST(CPPFLAGS) - AC_SUBST(LDFLAGS) - --GLIB_REQUIRED=2.26.0 -+GLIB_REQUIRED=2.35.4 - SQLITE_REQUIRED=3.7.11 - VALADOC_REQUIRED=0.2 - -diff --git a/datahub/Makefile.am b/datahub/Makefile.am -index 9629baa..19bcb3b 100644 ---- a/datahub/Makefile.am -+++ b/datahub/Makefile.am -@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg gio-unix-2.0 \ - --pkg gtk+-3.0 \ -diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am -index 99584e6..b7cd7c2 100644 ---- a/examples/vala/Makefile.am -+++ b/examples/vala/Makefile.am -@@ -8,7 +8,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \ - $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \ -diff --git a/extensions/Makefile.am b/extensions/Makefile.am -index 20139aa..72b9e24 100644 ---- a/extensions/Makefile.am -+++ b/extensions/Makefile.am -@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg sqlite3 \ - --pkg gmodule-2.0 \ -diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am -index 8bd9936..0ebf206 100644 ---- a/extensions/fts++/Makefile.am -+++ b/extensions/fts++/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg sqlite3 \ - --pkg posix \ -diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am -index f44e950..9af0cb4 100644 ---- a/libzeitgeist/Makefile.am -+++ b/libzeitgeist/Makefile.am -@@ -27,7 +27,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg gio-unix-2.0 \ - --pkg sqlite3 \ -diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala -index f0b65cb..3de1c7d 100644 ---- a/libzeitgeist/log.vala -+++ b/libzeitgeist/log.vala -@@ -59,9 +59,6 @@ namespace Zeitgeist - */ - public class Log : QueuedProxyWrapper - { -- [CCode (cname = "g_get_num_processors")] -- private extern static uint get_num_processors (); -- - class DbWorker - { - private unowned ThreadFunc func; -diff --git a/src/Makefile.am b/src/Makefile.am -index 3deb6c2..65751ef 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg sqlite3 \ - --pkg posix \ -diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am -index 80279d4..59e9f5f 100644 ---- a/test/direct/Makefile.am -+++ b/test/direct/Makefile.am -@@ -8,7 +8,7 @@ EXTRA_DIST = \ - $(NULL) - - AM_VALAFLAGS = \ -- --target-glib=2.26 \ -+ --target-glib=2.36 \ - --pkg gio-2.0 \ - --pkg gio-unix-2.0 \ - --pkg sqlite3 \ --- -2.0.4 - diff --git a/0012-tools-Drop-rogue-leading-unicode-character.patch b/0012-tools-Drop-rogue-leading-unicode-character.patch deleted file mode 100644 index c9d0365..0000000 --- a/0012-tools-Drop-rogue-leading-unicode-character.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ce9affa87a8775ef4c45d7508d1b519319b9162a Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 3 Jul 2014 09:39:05 +0200 -Subject: [PATCH 12/12] tools: Drop rogue leading unicode character - ---- - tools/development/cairoplot.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/development/cairoplot.py b/tools/development/cairoplot.py -index b39f765..8b1c564 100644 ---- a/tools/development/cairoplot.py -+++ b/tools/development/cairoplot.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python - # -*- coding: utf-8 -*- - - # CairoPlot.py --- -2.0.4 - diff --git a/sources b/sources index d94cb6a..8a6e423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92371b864515389ffe7d70569f0bc9ed zeitgeist-0.9.14.tar.xz +f56b58a19d5fd5a7365ddcbe26ee6b15 zeitgeist-0.9.16.tar.xz diff --git a/zeitgeist.spec b/zeitgeist.spec index 5468933..e51766b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 0.5.20140808.git.ce9affa%{?dist} +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -11,18 +11,7 @@ Summary: Framework providing Desktop activity awareness # tools/zeitgeist-explorer/ is GPLv2+ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: http://zeitgeist-project.com/ -Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-0.9.14.tar.xz -Patch0: 0001-Fix-unit-tests.patch -Patch1: 0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch -Patch2: 0003-bump-version-number-and-release-name.patch -Patch3: 0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch -Patch4: 0005-Replace-with-1.patch -Patch5: 0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch -Patch6: 0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch -Patch7: 0008-ontology2code-don-t-hardcode-python-path.patch -Patch8: 0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch -Patch9: 0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch -Patch10: 0012-tools-Drop-rogue-leading-unicode-character.patch +Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz BuildRequires: dbus-devel BuildRequires: dee-devel BuildRequires: gettext @@ -79,18 +68,7 @@ This package contains Python 2 API for developing applications that use %{name}. %prep -%setup -qn %{name}-0.9.14 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%setup -q ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -116,7 +94,8 @@ make check || true %postun libs -p /sbin/ldconfig %files -%doc AUTHORS COPYING COPYING.GPL NEWS +%doc AUTHORS NEWS +%license COPYING COPYING.GPL %{_bindir}/zeitgeist-daemon %{_bindir}/zeitgeist-datahub %{_libexecdir}/zeitgeist-fts @@ -129,7 +108,7 @@ make check || true %config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop %files libs -%doc COPYING +%license COPYING %{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib %{_libdir}/libzeitgeist-2.0.so.* @@ -148,6 +127,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Fri Aug 07 2015 Christopher Meng - 0.9.16-1 +- Update to 0.9.16 + * Fri Jun 19 2015 Fedora Release Engineering - 0.9.16-0.5.20140808.git.ce9affa - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 4043aad0c45eddcb57f37845eb0b013c777be8b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:04:57 +0000 Subject: [PATCH 36/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index e51766b..bc60a10 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -127,6 +127,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.9.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Aug 07 2015 Christopher Meng - 0.9.16-1 - Update to 0.9.16 From a94b177108969337fd3af689a41def2bc73c5955 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:15:40 +0000 Subject: [PATCH 37/91] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index bc60a10..5efd53b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -127,6 +127,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 0.9.16-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 0.9.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 32ce0a19eca1edb0c0836fb2600484abb578945e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Dec 2016 05:17:17 +0000 Subject: [PATCH 38/91] Rebuild (xapian 1.4) --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 5efd53b..cb8d8d7 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -127,6 +127,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Mon Dec 26 2016 Peter Robinson 0.9.16-4 +- Rebuild (xapian 1.4) + * Tue Jul 19 2016 Fedora Release Engineering - 0.9.16-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 10d90f80f3834c84055734b0b7b07a163719f4fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:23:17 +0000 Subject: [PATCH 39/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index cb8d8d7..0ea889e 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 0.9.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -127,6 +127,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.9.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 26 2016 Peter Robinson 0.9.16-4 - Rebuild (xapian 1.4) From 8bc762c024f9fc5a37d99301df18510f2584e0ab Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Feb 2017 21:05:10 +0000 Subject: [PATCH 40/91] Update to 1.0 --- .gitignore | 1 + sources | 2 +- zeitgeist.spec | 26 +++++++++++++++++++++----- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 840b6ba..667e02b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.14.tar.xz /zeitgeist-0.9.16.20140808gitce9affa.tar.gz /zeitgeist-0.9.16.tar.xz +/zeitgeist-1.0.tar.xz diff --git a/sources b/sources index 8a6e423..74a4735 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f56b58a19d5fd5a7365ddcbe26ee6b15 zeitgeist-0.9.16.tar.xz +SHA512 (zeitgeist-1.0.tar.xz) = e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 diff --git a/zeitgeist.spec b/zeitgeist.spec index 0ea889e..dca0246 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 0.9.16 -Release: 5%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -10,8 +10,8 @@ Summary: Framework providing Desktop activity awareness # test/c/ is GPLv3 # tools/zeitgeist-explorer/ is GPLv2+ License: LGPLv2+ and LGPLv3+ and GPLv2+ -URL: http://zeitgeist-project.com/ -Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz +URL: https://launchpad.net/zeitgeist +Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz BuildRequires: dbus-devel BuildRequires: dee-devel BuildRequires: gettext @@ -27,6 +27,8 @@ BuildRequires: sqlite-devel BuildRequires: telepathy-glib-devel BuildRequires: vala BuildRequires: xapian-core-devel +%{?systemd_requires} +BuildRequires: systemd Requires: dbus Requires: python-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 @@ -89,16 +91,25 @@ rm -frv %{buildroot}%{_datadir}/zeitgeist/doc %check make check || true +%post +%systemd_user_post %{name}.service +%systemd_user_post %{name}-fts.service + +%preun +%systemd_user_preun %{name}.service +%systemd_user_preun %{name}-fts.service + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig + %files %doc AUTHORS NEWS %license COPYING COPYING.GPL %{_bindir}/zeitgeist-daemon %{_bindir}/zeitgeist-datahub -%{_libexecdir}/zeitgeist-fts +%{_libexecdir}/%{name}/ %{_datadir}/%{name}/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service %dir %{_datadir}/bash-completion @@ -106,6 +117,8 @@ make check || true %{_datadir}/bash-completion/completions/zeitgeist-daemon %{_mandir}/man1/zeitgeist-*.* %config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop +%{_userunitdir}/%{name}.service +%{_userunitdir}/%{name}-fts.service %files libs %license COPYING @@ -127,6 +140,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Tue Feb 21 2017 David King - 1.0-1 +- Update to 1.0 + * Sat Feb 11 2017 Fedora Release Engineering - 0.9.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From dd7d05fc6f01254918925e7dc94a5f4dbc66a3ed Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Feb 2017 22:35:21 +0000 Subject: [PATCH 41/91] Use pkgconfig for BuildRequires https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- zeitgeist.spec | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index dca0246..ad81e67 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -12,23 +12,21 @@ Summary: Framework providing Desktop activity awareness License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -BuildRequires: dbus-devel -BuildRequires: dee-devel +BuildRequires: pkgconfig(dee-icu-1.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(telepathy-glib) BuildRequires: gettext -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel -BuildRequires: intltool -BuildRequires: json-glib-devel BuildRequires: python2-devel BuildRequires: python-rdflib BuildRequires: raptor2 -BuildRequires: sqlite-devel -BuildRequires: telepathy-glib-devel -BuildRequires: vala -BuildRequires: xapian-core-devel %{?systemd_requires} BuildRequires: systemd +BuildRequires: vala +BuildRequires: xapian-core-devel Requires: dbus Requires: python-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 @@ -37,7 +35,6 @@ Obsoletes: zeitgeist-datahub < 0.9.5-4 Zeitgeist is a service which logs the users's activities and events (files opened, websites visites, conversations hold with other people, etc.) and makes relevant information available to other applications. - Note that this package only contains the daemon, which you can use together with several different user interfaces. @@ -142,6 +139,7 @@ make check || true %changelog * Tue Feb 21 2017 David King - 1.0-1 - Update to 1.0 +- Use pkgconfig for BuildRequires * Sat Feb 11 2017 Fedora Release Engineering - 0.9.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f61eb13f114dbc00cb2cac9828966a7e78620290 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Feb 2017 22:41:18 +0000 Subject: [PATCH 42/91] Use python_provide macro As a consequence, rename the python subpackage to python2-zeitgeist. --- zeitgeist.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index ad81e67..0b9873a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -28,7 +28,7 @@ BuildRequires: systemd BuildRequires: vala BuildRequires: xapian-core-devel Requires: dbus -Requires: python-%{name} = %{version}-%{release} +Requires: python2-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 %description @@ -55,14 +55,15 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} This package contains libraries and header files for developing applications that use %{name}. -%package -n python-%{name} +%package -n python2-%{name} Summary: Python 2 bindings for %{name} BuildArch: noarch Requires: dbus-python Requires: pyxdg Requires: %{name} = %{version}-%{release} +%{?python_provide:%python_provide python2-%{name}} -%description -n python-%{name} +%description -n python2-%{name} This package contains Python 2 API for developing applications that use %{name}. @@ -133,13 +134,14 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-2.0.vapi %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi -%files -n python-%{name} +%files -n python2-%{name} %{python2_sitelib}/zeitgeist/ %changelog * Tue Feb 21 2017 David King - 1.0-1 - Update to 1.0 - Use pkgconfig for BuildRequires +- Use python_provide macro * Sat Feb 11 2017 Fedora Release Engineering - 0.9.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4f254f2f91eef0734f453a44dc596e307ebef0eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 21:11:37 +0000 Subject: [PATCH 43/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 0b9873a..42768ba 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -138,6 +138,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Mon May 15 2017 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Tue Feb 21 2017 David King - 1.0-1 - Update to 1.0 - Use pkgconfig for BuildRequires From 823d9c61ffd90afa7b565919102629c9d9bb7349 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:41:31 +0000 Subject: [PATCH 44/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 42768ba..4db2942 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -138,6 +138,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From f50ce570cc1a691ef4770bd39fdd831fb1911b36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:09:49 +0000 Subject: [PATCH 45/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 4db2942..da893a7 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -138,6 +138,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d7da2665c0eff26a0344920d787ed2d81fa33efb Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 21 Sep 2017 16:06:19 +0100 Subject: [PATCH 46/91] Fix service file variable substitution (#1464693) --- zeitgeist-1.0-fix-service-file-template.patch | 19 +++++++++++++++++++ zeitgeist.spec | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 zeitgeist-1.0-fix-service-file-template.patch diff --git a/zeitgeist-1.0-fix-service-file-template.patch b/zeitgeist-1.0-fix-service-file-template.patch new file mode 100644 index 0000000..092e854 --- /dev/null +++ b/zeitgeist-1.0-fix-service-file-template.patch @@ -0,0 +1,19 @@ +From 1bcc8585275b4a8a9d47652cfe2ee4d64d155c1f Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Mon, 27 Feb 2017 16:27:36 +0100 +Subject: Fix placeholder in systemd service template + + +diff --git a/extensions/fts++/zeitgeist-fts.service.in b/extensions/fts++/zeitgeist-fts.service.in +index 93bf8f6..6459c0c 100644 +--- a/extensions/fts++/zeitgeist-fts.service.in ++++ b/extensions/fts++/zeitgeist-fts.service.in +@@ -4,4 +4,4 @@ Description=Zeitgeist full-text search indexer + [Service] + Type=dbus + BusName=org.gnome.zeitgeist.SimpleIndexer +-ExecStart=@libexecdir@/zeitgeist-fts ++ExecStart=@pkglibexecdir@/zeitgeist-fts +-- +cgit v0.10.2 + diff --git a/zeitgeist.spec b/zeitgeist.spec index da893a7..822fe1a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -12,6 +12,9 @@ Summary: Framework providing Desktop activity awareness License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz +# https://bugzilla.redhat.com/show_bug.cgi?id=1464693 +Patch0: zeitgeist-1.0-fix-service-file-template.patch + BuildRequires: pkgconfig(dee-icu-1.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -27,6 +30,9 @@ BuildRequires: raptor2 BuildRequires: systemd BuildRequires: vala BuildRequires: xapian-core-devel +# For patch0. +BuildRequires: autoconf automake /usr/bin/autopoint libtool + Requires: dbus Requires: python2-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 @@ -69,12 +75,16 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -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 +# For patch0. +autoreconf --force --install + %configure --enable-fts --enable-datahub --disable-silent-rules %make_build @@ -138,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Thu Sep 21 2017 David King - 1.0-5 +- Fix service file variable substitution (#1464693) + * Thu Aug 03 2017 Fedora Release Engineering - 1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 79cf5080077e9ef37eb72b099a64b876dd4229fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:25:50 +0000 Subject: [PATCH 47/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 822fe1a..f5ea579 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -148,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Sep 21 2017 David King - 1.0-5 - Fix service file variable substitution (#1464693) From 0dd9687bf9dfc6f94fa22743f7f6466443716010 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Sat, 10 Feb 2018 23:47:03 +0100 Subject: [PATCH 48/91] Update Python 2 dependency declarations to new packaging standards --- zeitgeist.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index f5ea579..3488440 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -24,7 +24,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(telepathy-glib) BuildRequires: gettext BuildRequires: python2-devel -BuildRequires: python-rdflib +BuildRequires: python2-rdflib BuildRequires: raptor2 %{?systemd_requires} BuildRequires: systemd @@ -64,8 +64,8 @@ developing applications that use %{name}. %package -n python2-%{name} Summary: Python 2 bindings for %{name} BuildArch: noarch -Requires: dbus-python -Requires: pyxdg +Requires: python2-dbus +Requires: python2-pyxdg Requires: %{name} = %{version}-%{release} %{?python_provide:%python_provide python2-%{name}} @@ -148,6 +148,10 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sat Feb 10 2018 Iryna Shcherbina - 1.0-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 263dc36a7a2d24e27b7c169e1042ec0957fe38cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:49:00 +0000 Subject: [PATCH 49/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 3488440..2b03111 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -148,6 +148,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Feb 10 2018 Iryna Shcherbina - 1.0-7 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From a5d0a9c237c1ac0f6c7789d5b4c57bf705a962c3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:43 +0200 Subject: [PATCH 50/91] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zeitgeist.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeitgeist.spec b/zeitgeist.spec index 2b03111..1e587a4 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -15,6 +15,7 @@ Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{ # https://bugzilla.redhat.com/show_bug.cgi?id=1464693 Patch0: zeitgeist-1.0-fix-service-file-template.patch +BuildRequires: gcc-c++ BuildRequires: pkgconfig(dee-icu-1.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) From 3d3e9e4d65309d8bd5643c4b24c52123a072f2bb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:24 +0100 Subject: [PATCH 51/91] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- zeitgeist.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 1e587a4..d6ff93e 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -108,9 +108,7 @@ make check || true %systemd_user_preun %{name}.service %systemd_user_preun %{name}-fts.service -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files From 5d087a9f68e31bbcec8c5ed05f69aef748879a7b Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 29 Jan 2019 23:23:52 +0000 Subject: [PATCH 52/91] Update to 1.0.1 --- .gitignore | 1 + sources | 2 +- zeitgeist-1.0-fix-service-file-template.patch | 19 ------ ...geist-1.0.1-fix-ontology-vala-syntax.patch | 62 +++++++++++++++++++ zeitgeist.spec | 20 +++--- 5 files changed, 73 insertions(+), 31 deletions(-) delete mode 100644 zeitgeist-1.0-fix-service-file-template.patch create mode 100644 zeitgeist-1.0.1-fix-ontology-vala-syntax.patch diff --git a/.gitignore b/.gitignore index 667e02b..25f27b7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.16.20140808gitce9affa.tar.gz /zeitgeist-0.9.16.tar.xz /zeitgeist-1.0.tar.xz +/zeitgeist-1.0.1.tar.xz diff --git a/sources b/sources index 74a4735..3672bfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.tar.xz) = e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 +SHA512 (zeitgeist-1.0.1.tar.xz) = e800de89ac574af49b9449fe5cb623994ff2515ff36ba94d81f0b1eebcb93b1aeecfbde14c0dd1ea24aef36b5b69be33c2cdf2ef69fc17a69bf98b40dae80cef diff --git a/zeitgeist-1.0-fix-service-file-template.patch b/zeitgeist-1.0-fix-service-file-template.patch deleted file mode 100644 index 092e854..0000000 --- a/zeitgeist-1.0-fix-service-file-template.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 1bcc8585275b4a8a9d47652cfe2ee4d64d155c1f Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Mon, 27 Feb 2017 16:27:36 +0100 -Subject: Fix placeholder in systemd service template - - -diff --git a/extensions/fts++/zeitgeist-fts.service.in b/extensions/fts++/zeitgeist-fts.service.in -index 93bf8f6..6459c0c 100644 ---- a/extensions/fts++/zeitgeist-fts.service.in -+++ b/extensions/fts++/zeitgeist-fts.service.in -@@ -4,4 +4,4 @@ Description=Zeitgeist full-text search indexer - [Service] - Type=dbus - BusName=org.gnome.zeitgeist.SimpleIndexer --ExecStart=@libexecdir@/zeitgeist-fts -+ExecStart=@pkglibexecdir@/zeitgeist-fts --- -cgit v0.10.2 - diff --git a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch new file mode 100644 index 0000000..979e76b --- /dev/null +++ b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch @@ -0,0 +1,62 @@ +From cc4603a2b5d9e6f36d196432042f6f0048dd5d89 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 5 Apr 2018 13:12:51 +0200 +Subject: [PATCH] ontology: Avoid ownership mismatches of container elements to + fix memleak + +--- + libzeitgeist/ontology.vala.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libzeitgeist/ontology.vala.in b/libzeitgeist/ontology.vala.in +index 63171701..768fd005 100644 +--- a/libzeitgeist/ontology.vala.in ++++ b/libzeitgeist/ontology.vala.in +@@ -56,7 +56,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -64,7 +64,7 @@ namespace Zeitgeist + { + results.append (uri); + // Recursively get the other parents +- foreach (string parent_uri in get_all_parents (uri)) ++ foreach (unowned string parent_uri in get_all_parents (uri)) + if (results.index (parent_uri) == -1) + results.append (parent_uri); + } +@@ -76,7 +76,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -89,7 +89,7 @@ namespace Zeitgeist + public static List get_children (string symbol_uri) + { + initialize_symbols (); +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -103,7 +103,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List(); ++ var results = new List(); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +-- +2.18.1 + diff --git a/zeitgeist.spec b/zeitgeist.spec index d6ff93e..d9073a6 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0 -Release: 8%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -12,8 +12,7 @@ Summary: Framework providing Desktop activity awareness License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1464693 -Patch0: zeitgeist-1.0-fix-service-file-template.patch +Patch0: zeitgeist-1.0.1-fix-ontology-vala-syntax.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(dee-icu-1.0) @@ -31,8 +30,6 @@ BuildRequires: raptor2 BuildRequires: systemd BuildRequires: vala BuildRequires: xapian-core-devel -# For patch0. -BuildRequires: autoconf automake /usr/bin/autopoint libtool Requires: dbus Requires: python2-%{name} = %{version}-%{release} @@ -75,17 +72,15 @@ This package contains Python 2 API for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 + +sed -i -e 's|/usr/bin/env python|/usr/bin/python2|' data/ontology2code ## 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 -# For patch0. -autoreconf --force --install - %configure --enable-fts --enable-datahub --disable-silent-rules %make_build @@ -147,6 +142,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Tue Jan 29 2019 David King - 1.0.1-1 +- Update to 1.0.1 + * Sat Jul 14 2018 Fedora Release Engineering - 1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5cfaad390a48997043a0ed341bd32b85af4a6eca Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 29 Jan 2019 23:26:06 +0000 Subject: [PATCH 53/91] Fix VAPI file for recent Vala (#1668410) --- zeitgeist-1.0.1-fix-vapi.patch | 135 +++++++++++++++++++++++++++++ zeitgeist-1.0.1-fts-vala-fix.patch | 122 ++++++++++++++++++++++++++ zeitgeist.spec | 5 ++ 3 files changed, 262 insertions(+) create mode 100644 zeitgeist-1.0.1-fix-vapi.patch create mode 100644 zeitgeist-1.0.1-fts-vala-fix.patch diff --git a/zeitgeist-1.0.1-fix-vapi.patch b/zeitgeist-1.0.1-fix-vapi.patch new file mode 100644 index 0000000..9c1507f --- /dev/null +++ b/zeitgeist-1.0.1-fix-vapi.patch @@ -0,0 +1,135 @@ +From 131a84f1a65a4ce8bffd94f52746425f7e96b7ae Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 5 Jun 2018 23:23:26 +0200 +Subject: [PATCH] Asynchronous out-parameters are only allowed at the end of + argument lists + +This will not result in an ABI/API change on the c-level. +--- + extensions/fts++/zeitgeist-fts.vala | 8 ++++---- + extensions/fts.vala | 4 ++-- + libzeitgeist/index.vala | 6 +++--- + libzeitgeist/remote.vala | 7 ++++--- + 4 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala +index e408ff34..0f8ecbc6 100644 +--- a/extensions/fts++/zeitgeist-fts.vala ++++ b/extensions/fts++/zeitgeist-fts.vala +@@ -118,8 +118,8 @@ namespace Zeitgeist + public async void search (string query_string, Variant time_range, + Variant filter_templates, + uint offset, uint count, uint result_type, +- out Variant events, out uint matches, +- Cancellable? cancellable=null) ++ Cancellable? cancellable, ++ out Variant events, out uint matches) + throws Error + { + var tr = new TimeRange.from_variant (time_range); +@@ -140,9 +140,9 @@ namespace Zeitgeist + Variant filter_templates, + uint storage_state, uint offset, + uint count, uint result_type, ++ Cancellable? cancellable, + out Variant events, out double[] relevancies, +- out uint matches, +- Cancellable? cancellable=null) ++ out uint matches) + throws Error + { + var tr = new TimeRange.from_variant (time_range); +diff --git a/extensions/fts.vala b/extensions/fts.vala +index 0b8d81b7..359cd030 100644 +--- a/extensions/fts.vala ++++ b/extensions/fts.vala +@@ -183,7 +183,7 @@ namespace Zeitgeist + + var timer = new Timer (); + yield siin.search (query_string, time_range, filter_templates, +- offset, count, result_type, ++ offset, count, result_type, null, + out events, out matches); + debug ("Got %u[/%u] results from indexer (in %f seconds)", + (uint) events.n_children (), matches, timer.elapsed ()); +@@ -201,7 +201,7 @@ namespace Zeitgeist + var timer = new Timer (); + yield siin.search_with_relevancies ( + query_string, time_range, filter_templates, +- storage_state, offset, count, result_type, ++ storage_state, offset, count, result_type, null, + out events, out relevancies, out matches); + + debug ("Got %u[/%u] results from indexer (in %f seconds)", +diff --git a/libzeitgeist/index.vala b/libzeitgeist/index.vala +index e19621a5..458247ad 100644 +--- a/libzeitgeist/index.vala ++++ b/libzeitgeist/index.vala +@@ -137,7 +137,7 @@ public class Index : QueuedProxyWrapper + + yield proxy.search (query, time_range.to_variant (), + Events.to_variant (event_templates_cp), offset, num_events, +- result_type, out result, out matches, cancellable); ++ result_type, cancellable, out result, out matches); + + return new SimpleResultSet.with_num_matches ( + Events.from_variant (result), matches); +@@ -195,8 +195,8 @@ public class Index : QueuedProxyWrapper + + yield proxy.search_with_relevancies (query, time_range.to_variant (), + Events.to_variant (event_templates_cp), storage_state, offset, +- num_events, result_type, out relevancies_variant, out result, +- out matches, cancellable); ++ num_events, result_type, cancellable, out relevancies_variant, ++ out result, out matches); + + relevancies = new double[relevancies_variant.n_children ()]; + VariantIter iter = relevancies_variant.iterator (); +diff --git a/libzeitgeist/remote.vala b/libzeitgeist/remote.vala +index 0035e154..677aef5f 100644 +--- a/libzeitgeist/remote.vala ++++ b/libzeitgeist/remote.vala +@@ -141,16 +141,17 @@ namespace Zeitgeist + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, +- out uint matches, Cancellable? cancellable=null) throws Error; ++ out uint matches) throws Error; + public abstract async void search_with_relevancies ( + string query_string, + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint storage_state, uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, +- out double[] relevancies, out uint matches, +- Cancellable? cancellable=null) throws Error; ++ out double[] relevancies, out uint matches) throws Error; + } + + /* FIXME: Remove this! Only here because of a bug +--- a/src/ext-fts.vala ++++ b/src/ext-fts.vala +@@ -183,7 +183,7 @@ namespace Zeitgeist + + var timer = new Timer (); + yield siin.search (query_string, time_range, filter_templates, +- offset, count, result_type, ++ offset, count, result_type, null, + out events, out matches); + debug ("Got %u[/%u] results from indexer (in %f seconds)", + (uint) events.n_children (), matches, timer.elapsed ()); +@@ -201,7 +201,7 @@ namespace Zeitgeist + var timer = new Timer (); + yield siin.search_with_relevancies ( + query_string, time_range, filter_templates, +- storage_state, offset, count, result_type, ++ storage_state, offset, count, result_type, null, + out events, out relevancies, out matches); + + debug ("Got %u[/%u] results from indexer (in %f seconds)", +-- +2.18.1 + diff --git a/zeitgeist-1.0.1-fts-vala-fix.patch b/zeitgeist-1.0.1-fts-vala-fix.patch new file mode 100644 index 0000000..aacd691 --- /dev/null +++ b/zeitgeist-1.0.1-fts-vala-fix.patch @@ -0,0 +1,122 @@ +From 4cd7031da14d4a2a291f7a176b3e6c08c49ddcef Mon Sep 17 00:00:00 2001 +From: David King +Date: Wed, 30 Jan 2019 07:55:44 +0000 +Subject: [PATCH] fts: Adapt fully for commit 131a84f1 + +--- + extensions/fts.vala | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/extensions/fts.vala b/extensions/fts.vala +index 359cd030..72404e5f 100644 +--- a/extensions/fts.vala ++++ b/extensions/fts.vala +@@ -29,6 +29,7 @@ namespace Zeitgeist + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, + out uint matches) throws Error; + public abstract async void search_with_relevancies ( +@@ -36,6 +37,7 @@ namespace Zeitgeist + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint storage_state, uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, + out double[] relevancies, + out uint matches) throws Error; +@@ -177,13 +179,14 @@ namespace Zeitgeist + + public async void search (string query_string, Variant time_range, + Variant filter_templates, uint offset, uint count, uint result_type, +- out Variant events, out uint matches) throws Error ++ Cancellable? cancellable, out Variant events, ++ out uint matches) throws Error + { + if (siin == null) yield wait_for_proxy (); + + var timer = new Timer (); + yield siin.search (query_string, time_range, filter_templates, +- offset, count, result_type, null, ++ offset, count, result_type, cancellable, + out events, out matches); + debug ("Got %u[/%u] results from indexer (in %f seconds)", + (uint) events.n_children (), matches, timer.elapsed ()); +@@ -193,15 +196,15 @@ namespace Zeitgeist + string query_string, Variant time_range, + Variant filter_templates, uint storage_state, + uint offset, uint count, uint result_type, +- out Variant events, out double[] relevancies, out uint matches) +- throws Error ++ Cancellable? cancellable, out Variant events, ++ out double[] relevancies, out uint matches) throws Error + { + if (siin == null) yield wait_for_proxy (); + + var timer = new Timer (); + yield siin.search_with_relevancies ( + query_string, time_range, filter_templates, +- storage_state, offset, count, result_type, null, ++ storage_state, offset, count, result_type, cancellable, + out events, out relevancies, out matches); + + debug ("Got %u[/%u] results from indexer (in %f seconds)", +--- a/src/ext-fts.vala ++++ b/src/ext-fts.vala +@@ -29,6 +29,7 @@ namespace Zeitgeist + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, + out uint matches) throws Error; + public abstract async void search_with_relevancies ( +@@ -36,6 +37,7 @@ namespace Zeitgeist + [DBus (signature = "(xx)")] Variant time_range, + [DBus (signature = "a(asaasay)")] Variant filter_templates, + uint storage_state, uint offset, uint count, uint result_type, ++ Cancellable? cancellable, + [DBus (signature = "a(asaasay)")] out Variant events, + out double[] relevancies, + out uint matches) throws Error; +@@ -177,13 +179,14 @@ namespace Zeitgeist + + public async void search (string query_string, Variant time_range, + Variant filter_templates, uint offset, uint count, uint result_type, +- out Variant events, out uint matches) throws Error ++ Cancellable? cancellable, out Variant events, ++ out uint matches) throws Error + { + if (siin == null) yield wait_for_proxy (); + + var timer = new Timer (); + yield siin.search (query_string, time_range, filter_templates, +- offset, count, result_type, null, ++ offset, count, result_type, cancellable, + out events, out matches); + debug ("Got %u[/%u] results from indexer (in %f seconds)", + (uint) events.n_children (), matches, timer.elapsed ()); +@@ -193,15 +196,15 @@ namespace Zeitgeist + string query_string, Variant time_range, + Variant filter_templates, uint storage_state, + uint offset, uint count, uint result_type, +- out Variant events, out double[] relevancies, out uint matches) +- throws Error ++ Cancellable? cancellable, out Variant events, ++ out double[] relevancies, out uint matches) throws Error + { + if (siin == null) yield wait_for_proxy (); + + var timer = new Timer (); + yield siin.search_with_relevancies ( + query_string, time_range, filter_templates, +- storage_state, offset, count, result_type, null, ++ storage_state, offset, count, result_type, cancellable, + out events, out relevancies, out matches); + + debug ("Got %u[/%u] results from indexer (in %f seconds)", +-- +2.20.1 + diff --git a/zeitgeist.spec b/zeitgeist.spec index d9073a6..46ffd91 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -13,6 +13,10 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz Patch0: zeitgeist-1.0.1-fix-ontology-vala-syntax.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1668410 +Patch1: zeitgeist-1.0.1-fix-vapi.patch +# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/merge_requests/1 +Patch2: zeitgeist-1.0.1-fts-vala-fix.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(dee-icu-1.0) @@ -144,6 +148,7 @@ make check || true %changelog * Tue Jan 29 2019 David King - 1.0.1-1 - Update to 1.0.1 +- Fix VAPI file for recent Vala (#1668410) * Sat Jul 14 2018 Fedora Release Engineering - 1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c0c4a7af3a4a580341b70fe125a0dbeb5f808e19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:09:16 +0000 Subject: [PATCH 54/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 46ffd91..74f8afc 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -146,6 +146,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 29 2019 David King - 1.0.1-1 - Update to 1.0.1 - Fix VAPI file for recent Vala (#1668410) From 6e766e95f0f63d7845643f88737d4caf4e3753d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:58:12 +0000 Subject: [PATCH 55/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 74f8afc..ce0150b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -146,6 +146,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3829b27eb1c99e837407e0e36b019a6d23d762c3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 9 Sep 2019 17:52:34 +0200 Subject: [PATCH 56/91] update to version 1.0.2, drop python2 module --- .gitignore | 1 + 00-disable-python.patch | 353 ++++++++++++++++++ sources | 2 +- ...geist-1.0.1-fix-ontology-vala-syntax.patch | 62 --- zeitgeist-1.0.1-fix-vapi.patch | 135 ------- zeitgeist-1.0.1-fts-vala-fix.patch | 122 ------ zeitgeist.spec | 52 ++- 7 files changed, 376 insertions(+), 351 deletions(-) create mode 100644 00-disable-python.patch delete mode 100644 zeitgeist-1.0.1-fix-ontology-vala-syntax.patch delete mode 100644 zeitgeist-1.0.1-fix-vapi.patch delete mode 100644 zeitgeist-1.0.1-fts-vala-fix.patch diff --git a/.gitignore b/.gitignore index 25f27b7..264a2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.16.tar.xz /zeitgeist-1.0.tar.xz /zeitgeist-1.0.1.tar.xz +/zeitgeist-1.0.2.tar.xz diff --git a/00-disable-python.patch b/00-disable-python.patch new file mode 100644 index 0000000..beaf2c0 --- /dev/null +++ b/00-disable-python.patch @@ -0,0 +1,353 @@ +diff --git a/Makefile.am b/Makefile.am +index 9664cde..b145e62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,6 @@ SUBDIRS = \ + src \ + extensions \ + data \ +- python \ + test \ + examples \ + po \ +diff --git a/Makefile.in b/Makefile.in +index 395df47..f68dac0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = libzeitgeist src extensions data python test examples \ ++DIST_SUBDIRS = libzeitgeist src extensions data test examples \ + po doc datahub + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/compile \ +@@ -343,11 +343,6 @@ PKG_CONFIG = @PKG_CONFIG@ + PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ + PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POSUB = @POSUB@ +-PYTHON = @PYTHON@ +-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_PLATFORM = @PYTHON_PLATFORM@ +-PYTHON_PREFIX = @PYTHON_PREFIX@ +-PYTHON_VERSION = @PYTHON_VERSION@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -411,12 +406,10 @@ mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + pkgpyexecdir = @pkgpyexecdir@ +-pkgpythondir = @pkgpythondir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ + pyexecdir = @pyexecdir@ +-pythondir = @pythondir@ + runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +@@ -428,7 +421,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NULL = + ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS} +-SUBDIRS = libzeitgeist src extensions data python test examples po doc \ ++SUBDIRS = libzeitgeist src extensions data test examples po doc \ + $(NULL) $(am__append_1) + zeitgeistdocdir = $(pkgdatadir)/doc + zeitgeistdoc_DATA = \ +diff --git a/configure b/configure +index dd39c48..86708cd 100755 +--- a/configure ++++ b/configure +@@ -812,15 +812,6 @@ CPPFLAGS + LDFLAGS + CFLAGS + CC +-pkgpyexecdir +-pyexecdir +-pkgpythondir +-pythondir +-PYTHON_PLATFORM +-PYTHON_EXEC_PREFIX +-PYTHON_PREFIX +-PYTHON_VERSION +-PYTHON + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +@@ -921,7 +912,6 @@ enable_introspection + ac_precious_vars='build_alias + host_alias + target_alias +-PYTHON + CC + CFLAGS + LDFLAGS +@@ -1619,7 +1609,6 @@ Optional Packages: + Build the FTS extension with dee-icu + + Some influential environment variables: +- PYTHON the Python interpreter + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a +@@ -3224,215 +3213,6 @@ fi + MAINT=$MAINTAINER_MODE_TRUE + + +- +- +- +- +- +- +- +- # Find any Python interpreter. +- if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PYTHON in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PYTHON=$ac_cv_path_PYTHON +-if test -n "$PYTHON"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +-$as_echo "$PYTHON" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$PYTHON" && break +-done +-test -n "$PYTHON" || PYTHON=":" +- +- fi +- am_display_PYTHON=python +- +- +- if test "$PYTHON" = :; then +- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 +- else +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +-$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if ${am_cv_python_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +-$as_echo "$am_cv_python_version" >&6; } +- PYTHON_VERSION=$am_cv_python_version +- +- +- +- PYTHON_PREFIX='${prefix}' +- +- PYTHON_EXEC_PREFIX='${exec_prefix}' +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if ${am_cv_python_platform+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +-$as_echo "$am_cv_python_platform" >&6; } +- PYTHON_PLATFORM=$am_cv_python_platform +- +- +- # Just factor out some code duplication. +- am_python_setup_sysconfig="\ +-import sys +-# Prefer sysconfig over distutils.sysconfig, for better compatibility +-# with python 3.x. See automake bug#10227. +-try: +- import sysconfig +-except ImportError: +- can_use_sysconfig = 0 +-else: +- can_use_sysconfig = 1 +-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +-# +-try: +- from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': +- can_use_sysconfig = 0 +-except ImportError: +- pass" +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if ${am_cv_python_pythondir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- *) +- case $am_py_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +-$as_echo "$am_cv_python_pythondir" >&6; } +- pythondir=$am_cv_python_pythondir +- +- +- +- pkgpythondir=\${pythondir}/$PACKAGE +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if ${am_cv_python_pyexecdir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$exec_prefix" = xNONE +- then +- am_py_exec_prefix=$am_py_prefix +- else +- am_py_exec_prefix=$exec_prefix +- fi +- am_cv_python_pyexecdir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- *) +- case $am_py_exec_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; +- esac +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +-$as_echo "$am_cv_python_pyexecdir" >&6; } +- pyexecdir=$am_cv_python_pyexecdir +- +- +- +- pkgpyexecdir=\${pyexecdir}/$PACKAGE +- +- +- +- fi +- +- +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -18776,7 +18556,7 @@ $as_echo "yes" >&6; } + fi + + +-ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile python/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" ++ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" + + + ################################################# +@@ -19531,24 +19311,6 @@ fi + + + +-fi +- +-################################################# +-# Ontology parsing dependencies +-################################################# +- +-# check for python-rdflib +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5 +-$as_echo_n "checking for python-rdflib... " >&6; } +-echo "import rdflib" | $PYTHON - 2>/dev/null +-if test $? -ne 0 ; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "failed. Please install the python-rdflib package. +-See \`config.log' for more details" "$LINENO" 5; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } + fi + + ################################################# +@@ -20727,7 +20489,6 @@ do + "extensions/fts++/test/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/fts++/test/Makefile" ;; + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/ontology/Makefile") CONFIG_FILES="$CONFIG_FILES data/ontology/Makefile" ;; +- "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "test/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES test/dbus/Makefile" ;; + "test/direct/Makefile") CONFIG_FILES="$CONFIG_FILES test/direct/Makefile" ;; diff --git a/sources b/sources index 3672bfc..10eb7d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.1.tar.xz) = e800de89ac574af49b9449fe5cb623994ff2515ff36ba94d81f0b1eebcb93b1aeecfbde14c0dd1ea24aef36b5b69be33c2cdf2ef69fc17a69bf98b40dae80cef +SHA512 (zeitgeist-1.0.2.tar.xz) = 5feb96cd52bbc2fc0fb69759dc10d39358385e853c03324eb2e58b0ac44383362be6554bc7df4561f5636ab9ce7b6883b76385c98ddcb43e48e89fa809e85855 diff --git a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch deleted file mode 100644 index 979e76b..0000000 --- a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cc4603a2b5d9e6f36d196432042f6f0048dd5d89 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 5 Apr 2018 13:12:51 +0200 -Subject: [PATCH] ontology: Avoid ownership mismatches of container elements to - fix memleak - ---- - libzeitgeist/ontology.vala.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libzeitgeist/ontology.vala.in b/libzeitgeist/ontology.vala.in -index 63171701..768fd005 100644 ---- a/libzeitgeist/ontology.vala.in -+++ b/libzeitgeist/ontology.vala.in -@@ -56,7 +56,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -64,7 +64,7 @@ namespace Zeitgeist - { - results.append (uri); - // Recursively get the other parents -- foreach (string parent_uri in get_all_parents (uri)) -+ foreach (unowned string parent_uri in get_all_parents (uri)) - if (results.index (parent_uri) == -1) - results.append (parent_uri); - } -@@ -76,7 +76,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -89,7 +89,7 @@ namespace Zeitgeist - public static List get_children (string symbol_uri) - { - initialize_symbols (); -- var results = new List (); -+ var results = new List (); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - -@@ -103,7 +103,7 @@ namespace Zeitgeist - { - initialize_symbols (); - -- var results = new List(); -+ var results = new List(); - var symbol = all_symbols.lookup (symbol_uri); - if (symbol == null) return results; - --- -2.18.1 - diff --git a/zeitgeist-1.0.1-fix-vapi.patch b/zeitgeist-1.0.1-fix-vapi.patch deleted file mode 100644 index 9c1507f..0000000 --- a/zeitgeist-1.0.1-fix-vapi.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 131a84f1a65a4ce8bffd94f52746425f7e96b7ae Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 5 Jun 2018 23:23:26 +0200 -Subject: [PATCH] Asynchronous out-parameters are only allowed at the end of - argument lists - -This will not result in an ABI/API change on the c-level. ---- - extensions/fts++/zeitgeist-fts.vala | 8 ++++---- - extensions/fts.vala | 4 ++-- - libzeitgeist/index.vala | 6 +++--- - libzeitgeist/remote.vala | 7 ++++--- - 4 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala -index e408ff34..0f8ecbc6 100644 ---- a/extensions/fts++/zeitgeist-fts.vala -+++ b/extensions/fts++/zeitgeist-fts.vala -@@ -118,8 +118,8 @@ namespace Zeitgeist - public async void search (string query_string, Variant time_range, - Variant filter_templates, - uint offset, uint count, uint result_type, -- out Variant events, out uint matches, -- Cancellable? cancellable=null) -+ Cancellable? cancellable, -+ out Variant events, out uint matches) - throws Error - { - var tr = new TimeRange.from_variant (time_range); -@@ -140,9 +140,9 @@ namespace Zeitgeist - Variant filter_templates, - uint storage_state, uint offset, - uint count, uint result_type, -+ Cancellable? cancellable, - out Variant events, out double[] relevancies, -- out uint matches, -- Cancellable? cancellable=null) -+ out uint matches) - throws Error - { - var tr = new TimeRange.from_variant (time_range); -diff --git a/extensions/fts.vala b/extensions/fts.vala -index 0b8d81b7..359cd030 100644 ---- a/extensions/fts.vala -+++ b/extensions/fts.vala -@@ -183,7 +183,7 @@ namespace Zeitgeist - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, -+ offset, count, result_type, null, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -201,7 +201,7 @@ namespace Zeitgeist - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, -+ storage_state, offset, count, result_type, null, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", -diff --git a/libzeitgeist/index.vala b/libzeitgeist/index.vala -index e19621a5..458247ad 100644 ---- a/libzeitgeist/index.vala -+++ b/libzeitgeist/index.vala -@@ -137,7 +137,7 @@ public class Index : QueuedProxyWrapper - - yield proxy.search (query, time_range.to_variant (), - Events.to_variant (event_templates_cp), offset, num_events, -- result_type, out result, out matches, cancellable); -+ result_type, cancellable, out result, out matches); - - return new SimpleResultSet.with_num_matches ( - Events.from_variant (result), matches); -@@ -195,8 +195,8 @@ public class Index : QueuedProxyWrapper - - yield proxy.search_with_relevancies (query, time_range.to_variant (), - Events.to_variant (event_templates_cp), storage_state, offset, -- num_events, result_type, out relevancies_variant, out result, -- out matches, cancellable); -+ num_events, result_type, cancellable, out relevancies_variant, -+ out result, out matches); - - relevancies = new double[relevancies_variant.n_children ()]; - VariantIter iter = relevancies_variant.iterator (); -diff --git a/libzeitgeist/remote.vala b/libzeitgeist/remote.vala -index 0035e154..677aef5f 100644 ---- a/libzeitgeist/remote.vala -+++ b/libzeitgeist/remote.vala -@@ -141,16 +141,17 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, -- out uint matches, Cancellable? cancellable=null) throws Error; -+ out uint matches) throws Error; - public abstract async void search_with_relevancies ( - string query_string, - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, -- out double[] relevancies, out uint matches, -- Cancellable? cancellable=null) throws Error; -+ out double[] relevancies, out uint matches) throws Error; - } - - /* FIXME: Remove this! Only here because of a bug ---- a/src/ext-fts.vala -+++ b/src/ext-fts.vala -@@ -183,7 +183,7 @@ namespace Zeitgeist - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, -+ offset, count, result_type, null, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -201,7 +201,7 @@ namespace Zeitgeist - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, -+ storage_state, offset, count, result_type, null, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", --- -2.18.1 - diff --git a/zeitgeist-1.0.1-fts-vala-fix.patch b/zeitgeist-1.0.1-fts-vala-fix.patch deleted file mode 100644 index aacd691..0000000 --- a/zeitgeist-1.0.1-fts-vala-fix.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 4cd7031da14d4a2a291f7a176b3e6c08c49ddcef Mon Sep 17 00:00:00 2001 -From: David King -Date: Wed, 30 Jan 2019 07:55:44 +0000 -Subject: [PATCH] fts: Adapt fully for commit 131a84f1 - ---- - extensions/fts.vala | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/extensions/fts.vala b/extensions/fts.vala -index 359cd030..72404e5f 100644 ---- a/extensions/fts.vala -+++ b/extensions/fts.vala -@@ -29,6 +29,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out uint matches) throws Error; - public abstract async void search_with_relevancies ( -@@ -36,6 +37,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out double[] relevancies, - out uint matches) throws Error; -@@ -177,13 +179,14 @@ namespace Zeitgeist - - public async void search (string query_string, Variant time_range, - Variant filter_templates, uint offset, uint count, uint result_type, -- out Variant events, out uint matches) throws Error -+ Cancellable? cancellable, out Variant events, -+ out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, null, -+ offset, count, result_type, cancellable, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -193,15 +196,15 @@ namespace Zeitgeist - string query_string, Variant time_range, - Variant filter_templates, uint storage_state, - uint offset, uint count, uint result_type, -- out Variant events, out double[] relevancies, out uint matches) -- throws Error -+ Cancellable? cancellable, out Variant events, -+ out double[] relevancies, out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, null, -+ storage_state, offset, count, result_type, cancellable, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", ---- a/src/ext-fts.vala -+++ b/src/ext-fts.vala -@@ -29,6 +29,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out uint matches) throws Error; - public abstract async void search_with_relevancies ( -@@ -36,6 +37,7 @@ namespace Zeitgeist - [DBus (signature = "(xx)")] Variant time_range, - [DBus (signature = "a(asaasay)")] Variant filter_templates, - uint storage_state, uint offset, uint count, uint result_type, -+ Cancellable? cancellable, - [DBus (signature = "a(asaasay)")] out Variant events, - out double[] relevancies, - out uint matches) throws Error; -@@ -177,13 +179,14 @@ namespace Zeitgeist - - public async void search (string query_string, Variant time_range, - Variant filter_templates, uint offset, uint count, uint result_type, -- out Variant events, out uint matches) throws Error -+ Cancellable? cancellable, out Variant events, -+ out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search (query_string, time_range, filter_templates, -- offset, count, result_type, null, -+ offset, count, result_type, cancellable, - out events, out matches); - debug ("Got %u[/%u] results from indexer (in %f seconds)", - (uint) events.n_children (), matches, timer.elapsed ()); -@@ -193,15 +196,15 @@ namespace Zeitgeist - string query_string, Variant time_range, - Variant filter_templates, uint storage_state, - uint offset, uint count, uint result_type, -- out Variant events, out double[] relevancies, out uint matches) -- throws Error -+ Cancellable? cancellable, out Variant events, -+ out double[] relevancies, out uint matches) throws Error - { - if (siin == null) yield wait_for_proxy (); - - var timer = new Timer (); - yield siin.search_with_relevancies ( - query_string, time_range, filter_templates, -- storage_state, offset, count, result_type, null, -+ storage_state, offset, count, result_type, cancellable, - out events, out relevancies, out matches); - - debug ("Got %u[/%u] results from indexer (in %f seconds)", --- -2.20.1 - diff --git a/zeitgeist.spec b/zeitgeist.spec index ce0150b..1705c7c 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -10,15 +10,19 @@ Summary: Framework providing Desktop activity awareness # test/c/ is GPLv3 # tools/zeitgeist-explorer/ is GPLv2+ License: LGPLv2+ and LGPLv3+ and GPLv2+ + URL: https://launchpad.net/zeitgeist -Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -Patch0: zeitgeist-1.0.1-fix-ontology-vala-syntax.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1668410 -Patch1: zeitgeist-1.0.1-fix-vapi.patch -# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/merge_requests/1 -Patch2: zeitgeist-1.0.1-fts-vala-fix.patch +Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz + +# patch build system to disable building custom python2 bindings +Patch0: 00-disable-python.patch BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: systemd +BuildRequires: vala +BuildRequires: xapian-core-devel + BuildRequires: pkgconfig(dee-icu-1.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -26,18 +30,12 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(telepathy-glib) -BuildRequires: gettext -BuildRequires: python2-devel -BuildRequires: python2-rdflib -BuildRequires: raptor2 + %{?systemd_requires} -BuildRequires: systemd -BuildRequires: vala -BuildRequires: xapian-core-devel Requires: dbus -Requires: python2-%{name} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 +Obsoletes: python2-%{name} < 1.0.2-1 %description Zeitgeist is a service which logs the users's activities and events (files @@ -63,22 +61,12 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} This package contains libraries and header files for developing applications that use %{name}. -%package -n python2-%{name} -Summary: Python 2 bindings for %{name} -BuildArch: noarch -Requires: python2-dbus -Requires: python2-pyxdg -Requires: %{name} = %{version}-%{release} -%{?python_provide:%python_provide python2-%{name}} - -%description -n python2-%{name} -This package contains Python 2 API for -developing applications that use %{name}. %prep %autosetup -p1 -sed -i -e 's|/usr/bin/env python|/usr/bin/python2|' data/ontology2code +# make sure to nuke python stuff +rm -r python ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -142,10 +130,12 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-2.0.vapi %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi -%files -n python2-%{name} -%{python2_sitelib}/zeitgeist/ - %changelog +* Mon Sep 09 2019 Fabio Valentini - 1.0.2-1 +- Update to version 1.0.2. +- Drop unused python bindings. +- Drop unnecessary patches. + * Sat Jul 27 2019 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b226a4a8bf94b1a44841262f8f62c4179a46e586 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:16:49 +0000 Subject: [PATCH 57/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 1705c7c..755a402 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -131,6 +131,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Sep 09 2019 Fabio Valentini - 1.0.2-1 - Update to version 1.0.2. - Drop unused python bindings. From d92fbfcba7c8ec5a6ed03e49c465a94027e639be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:21:18 +0000 Subject: [PATCH 58/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 755a402..4d0dcdd 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -131,6 +131,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 594940b69b5b1df72c25bd9fa591f5626287527f Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 15 Oct 2020 11:28:17 +0100 Subject: [PATCH 59/91] Update to 1.0.3 (#1888547) --- .gitignore | 1 + 00-disable-python.patch | 353 ---------------------------------------- sources | 2 +- zeitgeist.spec | 18 +- 4 files changed, 12 insertions(+), 362 deletions(-) delete mode 100644 00-disable-python.patch diff --git a/.gitignore b/.gitignore index 264a2c0..088f0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-1.0.tar.xz /zeitgeist-1.0.1.tar.xz /zeitgeist-1.0.2.tar.xz +/zeitgeist-1.0.3.tar.xz diff --git a/00-disable-python.patch b/00-disable-python.patch deleted file mode 100644 index beaf2c0..0000000 --- a/00-disable-python.patch +++ /dev/null @@ -1,353 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 9664cde..b145e62 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,6 @@ SUBDIRS = \ - src \ - extensions \ - data \ -- python \ - test \ - examples \ - po \ -diff --git a/Makefile.in b/Makefile.in -index 395df47..f68dac0 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = libzeitgeist src extensions data python test examples \ -+DIST_SUBDIRS = libzeitgeist src extensions data test examples \ - po doc datahub - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/build-aux/compile \ -@@ -343,11 +343,6 @@ PKG_CONFIG = @PKG_CONFIG@ - PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - POSUB = @POSUB@ --PYTHON = @PYTHON@ --PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ --PYTHON_PLATFORM = @PYTHON_PLATFORM@ --PYTHON_PREFIX = @PYTHON_PREFIX@ --PYTHON_VERSION = @PYTHON_VERSION@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -@@ -411,12 +406,10 @@ mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - pkgpyexecdir = @pkgpyexecdir@ --pkgpythondir = @pkgpythondir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ --pythondir = @pythondir@ - runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -@@ -428,7 +421,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - NULL = - ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS} --SUBDIRS = libzeitgeist src extensions data python test examples po doc \ -+SUBDIRS = libzeitgeist src extensions data test examples po doc \ - $(NULL) $(am__append_1) - zeitgeistdocdir = $(pkgdatadir)/doc - zeitgeistdoc_DATA = \ -diff --git a/configure b/configure -index dd39c48..86708cd 100755 ---- a/configure -+++ b/configure -@@ -812,15 +812,6 @@ CPPFLAGS - LDFLAGS - CFLAGS - CC --pkgpyexecdir --pyexecdir --pkgpythondir --pythondir --PYTHON_PLATFORM --PYTHON_EXEC_PREFIX --PYTHON_PREFIX --PYTHON_VERSION --PYTHON - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE -@@ -921,7 +912,6 @@ enable_introspection - ac_precious_vars='build_alias - host_alias - target_alias --PYTHON - CC - CFLAGS - LDFLAGS -@@ -1619,7 +1609,6 @@ Optional Packages: - Build the FTS extension with dee-icu - - Some influential environment variables: -- PYTHON the Python interpreter - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a -@@ -3224,215 +3213,6 @@ fi - MAINT=$MAINTAINER_MODE_TRUE - - -- -- -- -- -- -- -- -- # Find any Python interpreter. -- if test -z "$PYTHON"; then -- for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PYTHON+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PYTHON in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- ;; --esac --fi --PYTHON=$ac_cv_path_PYTHON --if test -n "$PYTHON"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 --$as_echo "$PYTHON" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- test -n "$PYTHON" && break --done --test -n "$PYTHON" || PYTHON=":" -- -- fi -- am_display_PYTHON=python -- -- -- if test "$PYTHON" = :; then -- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 -- else -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 --$as_echo_n "checking for $am_display_PYTHON version... " >&6; } --if ${am_cv_python_version+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 --$as_echo "$am_cv_python_version" >&6; } -- PYTHON_VERSION=$am_cv_python_version -- -- -- -- PYTHON_PREFIX='${prefix}' -- -- PYTHON_EXEC_PREFIX='${exec_prefix}' -- -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 --$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } --if ${am_cv_python_platform+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 --$as_echo "$am_cv_python_platform" >&6; } -- PYTHON_PLATFORM=$am_cv_python_platform -- -- -- # Just factor out some code duplication. -- am_python_setup_sysconfig="\ --import sys --# Prefer sysconfig over distutils.sysconfig, for better compatibility --# with python 3.x. See automake bug#10227. --try: -- import sysconfig --except ImportError: -- can_use_sysconfig = 0 --else: -- can_use_sysconfig = 1 --# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: --# --try: -- from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -- can_use_sysconfig = 0 --except ImportError: -- pass" -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 --$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } --if ${am_cv_python_pythondir+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "x$prefix" = xNONE -- then -- am_py_prefix=$ac_default_prefix -- else -- am_py_prefix=$prefix -- fi -- am_cv_python_pythondir=`$PYTHON -c " --$am_python_setup_sysconfig --if can_use_sysconfig: -- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) --else: -- from distutils import sysconfig -- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') --sys.stdout.write(sitedir)"` -- case $am_cv_python_pythondir in -- $am_py_prefix*) -- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` -- ;; -- *) -- case $am_py_prefix in -- /usr|/System*) ;; -- *) -- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages -- ;; -- esac -- ;; -- esac -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 --$as_echo "$am_cv_python_pythondir" >&6; } -- pythondir=$am_cv_python_pythondir -- -- -- -- pkgpythondir=\${pythondir}/$PACKAGE -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 --$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } --if ${am_cv_python_pyexecdir+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "x$exec_prefix" = xNONE -- then -- am_py_exec_prefix=$am_py_prefix -- else -- am_py_exec_prefix=$exec_prefix -- fi -- am_cv_python_pyexecdir=`$PYTHON -c " --$am_python_setup_sysconfig --if can_use_sysconfig: -- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) --else: -- from distutils import sysconfig -- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') --sys.stdout.write(sitedir)"` -- case $am_cv_python_pyexecdir in -- $am_py_exec_prefix*) -- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` -- ;; -- *) -- case $am_py_exec_prefix in -- /usr|/System*) ;; -- *) -- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages -- ;; -- esac -- ;; -- esac -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 --$as_echo "$am_cv_python_pyexecdir" >&6; } -- pyexecdir=$am_cv_python_pyexecdir -- -- -- -- pkgpyexecdir=\${pyexecdir}/$PACKAGE -- -- -- -- fi -- -- -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -18776,7 +18556,7 @@ $as_echo "yes" >&6; } - fi - - --ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile python/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" -+ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in" - - - ################################################# -@@ -19531,24 +19311,6 @@ fi - - - --fi -- --################################################# --# Ontology parsing dependencies --################################################# -- --# check for python-rdflib --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5 --$as_echo_n "checking for python-rdflib... " >&6; } --echo "import rdflib" | $PYTHON - 2>/dev/null --if test $? -ne 0 ; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "failed. Please install the python-rdflib package. --See \`config.log' for more details" "$LINENO" 5; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } - fi - - ################################################# -@@ -20727,7 +20489,6 @@ do - "extensions/fts++/test/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/fts++/test/Makefile" ;; - "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/ontology/Makefile") CONFIG_FILES="$CONFIG_FILES data/ontology/Makefile" ;; -- "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; - "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "test/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES test/dbus/Makefile" ;; - "test/direct/Makefile") CONFIG_FILES="$CONFIG_FILES test/direct/Makefile" ;; diff --git a/sources b/sources index 10eb7d9..99456c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.2.tar.xz) = 5feb96cd52bbc2fc0fb69759dc10d39358385e853c03324eb2e58b0ac44383362be6554bc7df4561f5636ab9ce7b6883b76385c98ddcb43e48e89fa809e85855 +SHA512 (zeitgeist-1.0.3.tar.xz) = 79ff0972d1bc228ca5f1df63ee52b7b9b732f4e0a5d74db22b94c5066fb3e5fc02fd491b9e7571d1d215adad4fe11010aa5ad398abbd2f159dde5c88015afb33 diff --git a/zeitgeist.spec b/zeitgeist.spec index 4d0dcdd..d7faa2d 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -14,11 +14,10 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -# patch build system to disable building custom python2 bindings -Patch0: 00-disable-python.patch - BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: python3-devel +BuildRequires: python3-rdflib BuildRequires: systemd BuildRequires: vala BuildRequires: xapian-core-devel @@ -65,9 +64,6 @@ developing applications that use %{name}. %prep %autosetup -p1 -# make sure to nuke python stuff -rm -r python - ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure @@ -81,6 +77,9 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure find %{buildroot} -name '*.la' -delete -print +# Remove unused Python bindings. +rm -rf %{buildroot}%{python3_sitelib} + # We install AUTHORS and NEWS with %%doc instead rm -frv %{buildroot}%{_datadir}/zeitgeist/doc @@ -131,6 +130,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Oct 15 2020 David King - 1.0.3-1 +- Update to 1.0.3 (#1888547) + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2a77a7a993764f07e46b31fb2195bf9ee5028da3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:51:43 +0000 Subject: [PATCH 60/91] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zeitgeist.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeitgeist.spec b/zeitgeist.spec index d7faa2d..a423f88 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -14,6 +14,7 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: python3-devel From 4ab4e9e1725ff5cfc6b87935352821b4332d4783 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:40:19 +0000 Subject: [PATCH 61/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index a423f88..7105cdf 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -131,6 +131,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Oct 15 2020 David King - 1.0.3-1 - Update to 1.0.3 (#1888547) From 8b49887b1764f10fb80da9dd6f02cf51a43314cf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 14 Mar 2021 19:23:00 +0100 Subject: [PATCH 62/91] reintroduce Python bindings, they support Python 3 since version 1.0.3 --- zeitgeist.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 7105cdf..cfd82cb 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -44,6 +44,17 @@ makes relevant information available to other applications. Note that this package only contains the daemon, which you can use together with several different user interfaces. +%package -n python3-zeitgeist +Summary: Python 3 bindings for zeitgeist +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +# manually specify runtime dependencies (no metadata) +Requires: python3dist(dbus-python) + +%description -n python3-zeitgeist +This package contains the Python 3 bindings for zeitgeist. + %package libs Summary: Client library for interacting with the Zeitgeist daemon License: LGPLv2+ @@ -78,9 +89,6 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure find %{buildroot} -name '*.la' -delete -print -# Remove unused Python bindings. -rm -rf %{buildroot}%{python3_sitelib} - # We install AUTHORS and NEWS with %%doc instead rm -frv %{buildroot}%{_datadir}/zeitgeist/doc @@ -114,6 +122,9 @@ make check || true %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}-fts.service +%files -n python3-zeitgeist +%{python3_sitelib}/zeitgeist/ + %files libs %license COPYING %{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib @@ -131,6 +142,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Mar 14 2021 Fabio Valentini - 1.0.3-3 +- Reintroduce Python bindings, they support Python 3 since version 1.0.3. + * Thu Jan 28 2021 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ab1feba1fbb2b76de513dfc764e3eb2dcd8918b0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 20 Apr 2021 10:45:26 +0200 Subject: [PATCH 63/91] include upstream patches for vala 0.52 support --- 0001-use-genericarray-api-only.patch | 25 + 0002-fix-syntax-of-namespace-docs.patch | 24 + 0003-sync-custom-g-assert-cmp-bindings.patch | 611 +++++++++++++++++++ zeitgeist.spec | 10 +- 4 files changed, 669 insertions(+), 1 deletion(-) create mode 100644 0001-use-genericarray-api-only.patch create mode 100644 0002-fix-syntax-of-namespace-docs.patch create mode 100644 0003-sync-custom-g-assert-cmp-bindings.patch diff --git a/0001-use-genericarray-api-only.patch b/0001-use-genericarray-api-only.patch new file mode 100644 index 0000000..818df66 --- /dev/null +++ b/0001-use-genericarray-api-only.patch @@ -0,0 +1,25 @@ +From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 30 Dec 2020 16:50:32 +0100 +Subject: Use GenericArray API only + +--- + libzeitgeist/where-clause.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala +index 204e9b1..c3e6fa6 100644 +--- a/libzeitgeist/where-clause.vala ++++ b/libzeitgeist/where-clause.vala +@@ -216,7 +216,7 @@ namespace Zeitgeist + #else + long[] pointers = new long[gptrarr.length + 1]; + #endif +- Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, ++ Memory.copy(pointers, (void*) gptrarr.data, + gptrarr.length * sizeof (void *)); + return (T[]) pointers; + } +-- +cgit v1.1 + diff --git a/0002-fix-syntax-of-namespace-docs.patch b/0002-fix-syntax-of-namespace-docs.patch new file mode 100644 index 0000000..c0cf032 --- /dev/null +++ b/0002-fix-syntax-of-namespace-docs.patch @@ -0,0 +1,24 @@ +From 5d26650f0da9d47ce69cd9b739ad7a6990071f39 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 30 Dec 2020 16:56:17 +0100 +Subject: Fix syntax of namespace documentation block + +--- + libzeitgeist/log.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala +index 9b488af..53cd4f5 100644 +--- a/libzeitgeist/log.vala ++++ b/libzeitgeist/log.vala +@@ -29,6 +29,7 @@ + * + * Its main component is the Zeitgeist engine, a D-Bus service that logs + * any events other applications send to it. An event may be anything like: ++ * + * - The user opened/created/modified/closed a file, or visited a website. + * - The user received an e-mail, a phone call or an IM notification. + * - Someone modified a remote (eg. Google Drive) document owned by the user. +-- +cgit v1.1 + diff --git a/0003-sync-custom-g-assert-cmp-bindings.patch b/0003-sync-custom-g-assert-cmp-bindings.patch new file mode 100644 index 0000000..138f5a4 --- /dev/null +++ b/0003-sync-custom-g-assert-cmp-bindings.patch @@ -0,0 +1,611 @@ +From 702fdbac0e9174d9627813a267764c7448bc919f Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 30 Dec 2020 17:12:44 +0100 +Subject: Sync custom g_assert_cmp* bindings with vala 0.52 and use them as + needed + +--- + test/direct/assertions.vapi | 32 +++++---- + test/direct/datamodel-test.vala | 2 +- + test/direct/datasource-test.vala | 20 +++--- + test/direct/event-test.vala | 142 ++++++++++++++++++------------------- + test/direct/marshalling-test.vala | 6 +- + test/direct/mimetype-test.vala | 16 ++--- + test/direct/symbol-test.vala | 10 +-- + test/direct/table-lookup-test.vala | 14 ++-- + test/direct/where-clause-test.vala | 30 ++++---- + 9 files changed, 137 insertions(+), 135 deletions(-) + +diff --git a/test/direct/assertions.vapi b/test/direct/assertions.vapi +index 5848434..f3aebb8 100644 +--- a/test/direct/assertions.vapi ++++ b/test/direct/assertions.vapi +@@ -1,23 +1,25 @@ + [CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "glib.h")] + namespace Assertions { +- public enum OperatorType { ++#if !VALA_0_52 ++ public enum CompareOperator { + [CCode (cname = "==")] +- EQUAL, ++ EQ, + [CCode (cname = "!=")] +- NOT_EQUAL, +- [CCode (cname = "<")] +- LESS_THAN, +- [CCode (cname = ">")] +- GREATER_THAN, +- [CCode (cname = "<=")] +- LESS_OR_EQUAL, ++ NE, + [CCode (cname = ">=")] +- GREATER_OR_EQUAL ++ GE, ++ [CCode (cname = "<=")] ++ LE, ++ [CCode (cname = ">")] ++ GT, ++ [CCode (cname = "<")] ++ LT + } + +- public void assert_cmpstr (string? s1, OperatorType op, string? s2); +- public void assert_cmpint (int n1, OperatorType op, int n2); +- public void assert_cmpuint (uint n1, OperatorType op, uint n2); +- public void assert_cmphex (uint n1, OperatorType op, uint n2); +- public void assert_cmpfloat (float n1, OperatorType op, float n2); ++ public void assert_cmpstr (string? s1, CompareOperator op, string? s2); ++ public void assert_cmpint (int n1, CompareOperator op, int n2); ++ public void assert_cmpuint (uint n1, CompareOperator op, uint n2); ++ public void assert_cmphex (uint n1, CompareOperator op, uint n2); ++ public void assert_cmpfloat (double n1, CompareOperator op, double n2); ++#endif + } +diff --git a/test/direct/datamodel-test.vala b/test/direct/datamodel-test.vala +index 4fc0304..036e075 100644 +--- a/test/direct/datamodel-test.vala ++++ b/test/direct/datamodel-test.vala +@@ -113,7 +113,7 @@ void foreach_test () + int i = 0; + foreach (Event e in result_set) + { +- assert_cmpint ((int) e.id, OperatorType.EQUAL, i); ++ assert_cmpint ((int) e.id, CompareOperator.EQ, i); + i++; + } + +diff --git a/test/direct/datasource-test.vala b/test/direct/datasource-test.vala +index c9066f4..c15c92c 100644 +--- a/test/direct/datasource-test.vala ++++ b/test/direct/datasource-test.vala +@@ -35,9 +35,9 @@ int main (string[] argv) + void create_empty_test () + { + var src = new DataSource (); +- assert_cmpstr (src.unique_id, OperatorType.EQUAL, null); +- assert_cmpstr (src.name, OperatorType.EQUAL, null); +- assert_cmpstr (src.description, OperatorType.EQUAL, null); ++ assert_cmpstr (src.unique_id, CompareOperator.EQ, null); ++ assert_cmpstr (src.name, CompareOperator.EQ, null); ++ assert_cmpstr (src.description, CompareOperator.EQ, null); + assert (src.event_templates == null); + assert (src.running == false); + assert (src.timestamp == 0); +@@ -48,9 +48,9 @@ void create_full_test () + { + var src = new DataSource.full ("my-id", "my-name", "my-desc", null); + +- assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); +- assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); +- assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); ++ assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); ++ assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); ++ assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); + assert (src.event_templates == null); + assert (src.running == false); + assert (src.timestamp == 0); +@@ -81,16 +81,16 @@ void to_from_variant_test () + orig.event_templates = event_templates; + + var src = new DataSource.from_variant (orig.to_variant ()); +- assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); +- assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); +- assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); ++ assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); ++ assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); ++ assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); + assert (src.event_templates != null); + assert (src.running == false); + assert (src.timestamp == now); + assert (src.enabled == true); + + event_templates = src.event_templates; +- assert_cmpint (event_templates.length, OperatorType.EQUAL, 1); ++ assert_cmpint (event_templates.length, CompareOperator.EQ, 1); + assert (event_templates.get (0) is Event); + } + +diff --git a/test/direct/event-test.vala b/test/direct/event-test.vala +index 7189057..b47ddb8 100644 +--- a/test/direct/event-test.vala ++++ b/test/direct/event-test.vala +@@ -46,11 +46,11 @@ void create_empty_test () + + assert (ev.id == 0); + assert (ev.timestamp == 0); +- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, null); +- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, null); +- assert_cmpstr (ev.actor, OperatorType.EQUAL, null); +- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); +- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 0); ++ assert_cmpstr (ev.interpretation, CompareOperator.EQ, null); ++ assert_cmpstr (ev.manifestation, CompareOperator.EQ, null); ++ assert_cmpstr (ev.actor, CompareOperator.EQ, null); ++ assert_cmpstr (ev.origin, CompareOperator.EQ, null); ++ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 0); + assert (ev.payload == null); + } + +@@ -65,22 +65,22 @@ void create_full_test () + + assert (ev.id == 0); + assert (ev.timestamp == 0); +- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); +- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); +- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://firefox.desktop"); +- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); +- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 2); ++ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); ++ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); ++ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://firefox.desktop"); ++ assert_cmpstr (ev.origin, CompareOperator.EQ, null); ++ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 2); + assert (ev.payload == null); + + var su = ev.subjects[1]; +- assert_cmpstr (su.uri, OperatorType.EQUAL, null); +- assert_cmpstr (su.interpretation, OperatorType.EQUAL, null); +- assert_cmpstr (su.manifestation, OperatorType.EQUAL, null); +- assert_cmpstr (su.mimetype, OperatorType.EQUAL, null); +- assert_cmpstr (su.origin, OperatorType.EQUAL, null); +- assert_cmpstr (su.text, OperatorType.EQUAL, null); +- assert_cmpstr (su.storage, OperatorType.EQUAL, null); +- assert_cmpstr (su.current_uri, OperatorType.EQUAL, null); ++ assert_cmpstr (su.uri, CompareOperator.EQ, null); ++ assert_cmpstr (su.interpretation, CompareOperator.EQ, null); ++ assert_cmpstr (su.manifestation, CompareOperator.EQ, null); ++ assert_cmpstr (su.mimetype, CompareOperator.EQ, null); ++ assert_cmpstr (su.origin, CompareOperator.EQ, null); ++ assert_cmpstr (su.text, CompareOperator.EQ, null); ++ assert_cmpstr (su.storage, CompareOperator.EQ, null); ++ assert_cmpstr (su.current_uri, CompareOperator.EQ, null); + } + + void actor_from_app_info_test () +@@ -90,7 +90,7 @@ void actor_from_app_info_test () + + var ev = new Event (); + ev.set_actor_from_app_info (appinfo); +- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://test.desktop"); ++ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://test.desktop"); + } + + void from_variant_test () +@@ -139,26 +139,26 @@ void from_variant_test () + + assert (ev.id == 27); + assert (ev.timestamp == 68); +- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); +- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); +- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); +- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); +- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); ++ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); ++ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); ++ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); ++ assert_cmpstr (ev.origin, CompareOperator.EQ, null); ++ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); + + var su = ev.subjects[0]; +- assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); +- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); +- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); +- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); +- assert_cmpstr (su.origin, OperatorType.EQUAL, "file://tmp"); +- assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); ++ assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); ++ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); ++ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); ++ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); ++ assert_cmpstr (su.origin, CompareOperator.EQ, "file://tmp"); ++ assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); + + var payload = ev.payload; + assert (payload != null); +- assert_cmpuint (payload.len, OperatorType.EQUAL, 3); +- assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); +- assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); +- assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); ++ assert_cmpuint (payload.len, CompareOperator.EQ, 3); ++ assert_cmpint (payload.data[0], CompareOperator.EQ, 1); ++ assert_cmpint (payload.data[1], CompareOperator.EQ, 2); ++ assert_cmpint (payload.data[2], CompareOperator.EQ, 3); + } + + void from_variant_with_new_fields_test () +@@ -210,29 +210,29 @@ void from_variant_with_new_fields_test () + + assert (ev.id == 27); + assert (ev.timestamp == 68); +- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); +- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); +- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); +- assert_cmpstr (ev.origin, OperatorType.EQUAL, "origin"); +- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); ++ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); ++ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); ++ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); ++ assert_cmpstr (ev.origin, CompareOperator.EQ, "origin"); ++ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); + + var su = ev.subjects[0]; +- assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); +- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); +- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); +- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); +- assert_cmpstr (su.origin, OperatorType.EQUAL, "file:///tmp"); +- assert_cmpstr (su.text, OperatorType.EQUAL, "foo.text"); +- assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); +- assert_cmpstr (su.current_uri, OperatorType.EQUAL, "file:///tmp/current.txt"); +- assert_cmpstr (su.current_origin, OperatorType.EQUAL, "file:///tmp1"); ++ assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); ++ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); ++ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); ++ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); ++ assert_cmpstr (su.origin, CompareOperator.EQ, "file:///tmp"); ++ assert_cmpstr (su.text, CompareOperator.EQ, "foo.text"); ++ assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); ++ assert_cmpstr (su.current_uri, CompareOperator.EQ, "file:///tmp/current.txt"); ++ assert_cmpstr (su.current_origin, CompareOperator.EQ, "file:///tmp1"); + + var payload = ev.payload; + assert (payload != null); +- assert_cmpuint (payload.len, OperatorType.EQUAL, 3); +- assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); +- assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); +- assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); ++ assert_cmpuint (payload.len, CompareOperator.EQ, 3); ++ assert_cmpint (payload.data[0], CompareOperator.EQ, 1); ++ assert_cmpint (payload.data[1], CompareOperator.EQ, 2); ++ assert_cmpint (payload.data[2], CompareOperator.EQ, 3); + + } + +@@ -252,11 +252,11 @@ void empty_to_from_variant_test () + + assert (marshalled.id == 0); + assert (marshalled.timestamp == orig.timestamp); +- assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, null); +- assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, null); +- assert_cmpstr (marshalled.actor, OperatorType.EQUAL, null); +- assert_cmpstr (marshalled.origin, OperatorType.EQUAL, null); +- assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 0); ++ assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, null); ++ assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, null); ++ assert_cmpstr (marshalled.actor, CompareOperator.EQ, null); ++ assert_cmpstr (marshalled.origin, CompareOperator.EQ, null); ++ assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 0); + assert (marshalled.payload == null); + } + +@@ -278,11 +278,11 @@ void with_one_subject_to_from_variant_test () + var marshalled = new Event.from_variant (orig.to_variant ()); + + assert (marshalled.id == 0); +- assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); +- assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); +- assert_cmpstr (marshalled.actor, OperatorType.EQUAL, "application://firefox.desktop"); +- assert_cmpstr (marshalled.origin, OperatorType.EQUAL, "origin"); +- assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 1); ++ assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); ++ assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); ++ assert_cmpstr (marshalled.actor, CompareOperator.EQ, "application://firefox.desktop"); ++ assert_cmpstr (marshalled.origin, CompareOperator.EQ, "origin"); ++ assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 1); + + payload = marshalled.payload; + assert (payload != null); +@@ -290,14 +290,14 @@ void with_one_subject_to_from_variant_test () + assert (payload.data[0] == 255); + + var su = marshalled.subjects[0]; +- assert_cmpstr (su.uri, OperatorType.EQUAL, "http://example.com"); +- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.WEBSITE); +- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.REMOTE_DATA_OBJECT); +- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/html"); +- assert_cmpstr (su.origin, OperatorType.EQUAL, "http://example.com"); +- assert_cmpstr (su.text, OperatorType.EQUAL, "example.com"); +- assert_cmpstr (su.storage, OperatorType.EQUAL, "net"); +- assert_cmpstr (su.current_uri, OperatorType.EQUAL, "http://current-example.com"); ++ assert_cmpstr (su.uri, CompareOperator.EQ, "http://example.com"); ++ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.WEBSITE); ++ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.REMOTE_DATA_OBJECT); ++ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/html"); ++ assert_cmpstr (su.origin, CompareOperator.EQ, "http://example.com"); ++ assert_cmpstr (su.text, CompareOperator.EQ, "example.com"); ++ assert_cmpstr (su.storage, CompareOperator.EQ, "net"); ++ assert_cmpstr (su.current_uri, CompareOperator.EQ, "http://current-example.com"); + } + + void three_events_to_from_variant_test () +@@ -324,7 +324,7 @@ void zero_events_to_from_variant_test () + var vevents = Events.to_variant (events); + assert (vevents.n_children () == 0); + events = Events.from_variant (vevents); +- assert_cmpint (events.length, OperatorType.EQUAL, 0); ++ assert_cmpint (events.length, CompareOperator.EQ, 0); + } + + // vim:expandtab:ts=4:sw=4 +diff --git a/test/direct/marshalling-test.vala b/test/direct/marshalling-test.vala +index befe39b..a611fe1 100644 +--- a/test/direct/marshalling-test.vala ++++ b/test/direct/marshalling-test.vala +@@ -98,7 +98,7 @@ void events_test () + Variant vevents = Events.to_variant (events); + + var demarshalled = Events.from_variant (vevents); +- assert_cmpint (demarshalled.length, OperatorType.EQUAL, 1000); ++ assert_cmpint (demarshalled.length, CompareOperator.EQ, 1000); + } + + void timerange_test () +@@ -107,8 +107,8 @@ void timerange_test () + { + Variant v = new Variant("(xx)", i, i+42); + TimeRange timerange = new TimeRange.from_variant (v); +- assert_cmpint ((int) timerange.start, OperatorType.EQUAL, (int)i); +- assert_cmpint ((int) timerange.end, OperatorType.EQUAL, (int)i+42); ++ assert_cmpint ((int) timerange.start, CompareOperator.EQ, (int)i); ++ assert_cmpint ((int) timerange.end, CompareOperator.EQ, (int)i+42); + } + } + +diff --git a/test/direct/mimetype-test.vala b/test/direct/mimetype-test.vala +index f0b1bf0..327e4f7 100644 +--- a/test/direct/mimetype-test.vala ++++ b/test/direct/mimetype-test.vala +@@ -42,18 +42,18 @@ int main (string[] args) + + public void mime_type_basic_test () + { +- assert_cmpstr (NFO.TEXT_DOCUMENT, OperatorType.EQUAL, ++ assert_cmpstr (NFO.TEXT_DOCUMENT, CompareOperator.EQ, + interpretation_for_mimetype ("text/plain")); + } + + public void mime_type_regex_test () + { + // We should have a fallack for application/x-applix-* +- assert_cmpstr (NFO.DOCUMENT, OperatorType.EQUAL, ++ assert_cmpstr (NFO.DOCUMENT, CompareOperator.EQ, + interpretation_for_mimetype ("application/x-applix-FOOBAR")); + + // Still application/x-applix-speadsheet should be a spreadsheet +- assert_cmpstr (NFO.SPREADSHEET, OperatorType.EQUAL, ++ assert_cmpstr (NFO.SPREADSHEET, CompareOperator.EQ, + interpretation_for_mimetype ("application/x-applix-spreadsheet")); + } + +@@ -81,17 +81,17 @@ public void mime_type_registration_test () + mime_type_regex_test (); + mime_type_none_test (); + +- assert_cmpstr ("Bluebird", OperatorType.EQUAL, ++ assert_cmpstr ("Bluebird", CompareOperator.EQ, + interpretation_for_mimetype ("awesome/bird")); +- assert_cmpstr ("is nothing", OperatorType.EQUAL, ++ assert_cmpstr ("is nothing", CompareOperator.EQ, + interpretation_for_mimetype ("everything/everywhere")); + } + + public void uri_scheme_basic_test () + { +- assert_cmpstr (NFO.FILE_DATA_OBJECT, OperatorType.EQUAL, ++ assert_cmpstr (NFO.FILE_DATA_OBJECT, CompareOperator.EQ, + manifestation_for_uri ("file:///tmp/foo.txt")); +- assert_cmpstr (NFO.REMOTE_DATA_OBJECT, OperatorType.EQUAL, ++ assert_cmpstr (NFO.REMOTE_DATA_OBJECT, CompareOperator.EQ, + manifestation_for_uri ("ftp://ftp.example.com")); + } + +@@ -107,7 +107,7 @@ public void uri_scheme_registration_test () + uri_scheme_basic_test (); + uri_scheme_none_test (); + +- assert_cmpstr ("the answer", OperatorType.EQUAL, ++ assert_cmpstr ("the answer", CompareOperator.EQ, + manifestation_for_uri ("42://what is it?")); + } + +diff --git a/test/direct/symbol-test.vala b/test/direct/symbol-test.vala +index e47024d..0261fe8 100644 +--- a/test/direct/symbol-test.vala ++++ b/test/direct/symbol-test.vala +@@ -100,7 +100,7 @@ void is_uri_valid (string uri) + void media_children_test () + { + var children = Symbol.get_children (NFO.MEDIA); +- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); ++ assert_cmpuint (children.length (), CompareOperator.GT, 0); + foreach (string uri in children) + is_uri_valid (uri); + } +@@ -108,7 +108,7 @@ void media_children_test () + void media_all_children_test () + { + var children = Symbol.get_all_children (NFO.MEDIA); +- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); ++ assert_cmpuint (children.length (), CompareOperator.GT, 0); + foreach (string uri in children) + is_uri_valid (uri); + } +@@ -116,7 +116,7 @@ void media_all_children_test () + void vector_image_parents_test () + { + var parents = Symbol.get_all_parents (NFO.VECTOR_IMAGE); +- assert_cmpuint (parents.length (), OperatorType.GREATER_THAN, 0); ++ assert_cmpuint (parents.length (), CompareOperator.GT, 0); + foreach (string uri in parents) + is_uri_valid (uri); + } +@@ -126,8 +126,8 @@ void media_complex_test () + var children = Symbol.get_children (NFO.MEDIA); + var all_ch = Symbol.get_all_children (NFO.MEDIA); + +- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); +- assert_cmpuint (all_ch.length (), OperatorType.GREATER_THAN, children.length ()); ++ assert_cmpuint (children.length (), CompareOperator.GT, 0); ++ assert_cmpuint (all_ch.length (), CompareOperator.GT, children.length ()); + + foreach (string uri in children) + { +diff --git a/test/direct/table-lookup-test.vala b/test/direct/table-lookup-test.vala +index 0ce51ef..a5e25e1 100644 +--- a/test/direct/table-lookup-test.vala ++++ b/test/direct/table-lookup-test.vala +@@ -58,15 +58,15 @@ public void basic_test () + TableLookup table_lookup = new TableLookup (database, "actor"); + + int id = table_lookup.id_for_string ("1st-actor"); +- assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); +- assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id); ++ assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); ++ assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id); + + int rc = db.exec ("DELETE FROM actor WHERE value='1st-actor'"); + assert (rc == Sqlite.OK); + + table_lookup.remove (1); +- assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); +- assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id+2); ++ assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); ++ assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id+2); + } + + public void get_value_with_query_test () +@@ -78,7 +78,7 @@ public void get_value_with_query_test () + int rc = db.exec ("INSERT INTO actor (id, value) VALUES (100, 'new-actor')"); + assert (rc == Sqlite.OK); + +- assert_cmpstr (table_lookup.get_value (100), OperatorType.EQUAL, "new-actor"); ++ assert_cmpstr (table_lookup.get_value (100), CompareOperator.EQ, "new-actor"); + } + + public void engine_test () +@@ -88,14 +88,14 @@ public void engine_test () + unowned Sqlite.Database db = database.database; + TableLookup table_lookup = engine.get_actors_table_lookup(); + +- assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 1); ++ assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 1); + + // Since we're running with Engine, this should trigger the deletion + // callback, which in turn should fix the cache (LP: #598666). + int rc = db.exec ("DELETE FROM actor WHERE value='something'"); + assert (rc == Sqlite.OK); + +- assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 2); ++ assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 2); + } + + // vim:expandtab:ts=4:sw=4 +diff --git a/test/direct/where-clause-test.vala b/test/direct/where-clause-test.vala +index e746daf..831a8c1 100644 +--- a/test/direct/where-clause-test.vala ++++ b/test/direct/where-clause-test.vala +@@ -59,16 +59,16 @@ public void basic_test () + where = new WhereClause (WhereClause.Type.AND); + where.add ("1st condition"); + where.add ("2nd condition"); +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition AND 2nd condition)"); ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition AND 2nd condition)"); + + where = new WhereClause (WhereClause.Type.OR); + where.add ("1st condition"); + where.add ("2nd condition"); +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition OR 2nd condition)"); ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition OR 2nd condition)"); + + where = new WhereClause (WhereClause.Type.AND, true); + where.add ("some condition"); +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "NOT some condition"); ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "NOT some condition"); + } + + public void nested_test () +@@ -88,16 +88,16 @@ public void nested_test () + where.extend (subwhere); + where.add ("last condition"); + +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, + "(1st condition AND (2nd condition OR 3rd condition) AND " + + "last condition)"); + + { + var args = where.get_bind_arguments (); +- assert_cmpint (args.length, OperatorType.EQUAL, 3); +- assert_cmpstr (args[0], OperatorType.EQUAL, "arg1"); +- assert_cmpstr (args[1], OperatorType.EQUAL, "arg2"); +- assert_cmpstr (args[2], OperatorType.EQUAL, "arg3"); ++ assert_cmpint (args.length, CompareOperator.EQ, 3); ++ assert_cmpstr (args[0], CompareOperator.EQ, "arg1"); ++ assert_cmpstr (args[1], CompareOperator.EQ, "arg2"); ++ assert_cmpstr (args[2], CompareOperator.EQ, "arg3"); + } + } + +@@ -112,7 +112,7 @@ public void nested_negation_test () + where.extend (subwhere); + where.add ("cond3"); + +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, + "(cond1 OR NOT cond2 OR cond3)"); + } + +@@ -123,14 +123,14 @@ public void match_condition_test () + // Plain + where = new WhereClause (WhereClause.Type.AND); + where.add_match_condition ("field1", 5); +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, + "field1 = 5"); +- assert_cmpint (where.get_bind_arguments ().length, OperatorType.EQUAL, 0); ++ assert_cmpint (where.get_bind_arguments ().length, CompareOperator.EQ, 0); + + // Negation + where = new WhereClause (WhereClause.Type.AND); + where.add_match_condition ("f2", 3, true); +- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "f2 != 3"); ++ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "f2 != 3"); + + // FIXME: test LIKE stuff... + } +@@ -138,9 +138,9 @@ public void match_condition_test () + public void right_boundary_test () + { + var clause = new PublicWhereClause (WhereClause.Type.AND); +- assert_cmpstr (clause.get_right_boundary ("a"), OperatorType.EQUAL, "b"); +- assert_cmpstr (clause.get_right_boundary ("hello"), OperatorType.EQUAL, "hellp"); +- assert_cmpstr (clause.get_right_boundary ("a b"), OperatorType.EQUAL, "a c"); ++ assert_cmpstr (clause.get_right_boundary ("a"), CompareOperator.EQ, "b"); ++ assert_cmpstr (clause.get_right_boundary ("hello"), CompareOperator.EQ, "hellp"); ++ assert_cmpstr (clause.get_right_boundary ("a b"), CompareOperator.EQ, "a c"); + } + + // vim:expandtab:ts=4:sw=4 +-- +cgit v1.1 + diff --git a/zeitgeist.spec b/zeitgeist.spec index cfd82cb..c679cf0 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -14,6 +14,11 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz +# include upstream patches for vala 0.52 support +Patch1: 0001-use-genericarray-api-only.patch +Patch2: 0002-fix-syntax-of-namespace-docs.patch +Patch3: 0003-sync-custom-g-assert-cmp-bindings.patch + BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gettext @@ -142,6 +147,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Tue Apr 20 2021 Fabio Valentini - 1.0.3-4 +- Include upstream patches for vala 0.52 support. + * Sun Mar 14 2021 Fabio Valentini - 1.0.3-3 - Reintroduce Python bindings, they support Python 3 since version 1.0.3. From bb2c1b4f0f71a187d5800495d3ba118f61209e10 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:20:48 +0200 Subject: [PATCH 64/91] Rebuilt for Python 3.10 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index c679cf0..86c479b 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -147,6 +147,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jun 04 2021 Python Maint - 1.0.3-5 +- Rebuilt for Python 3.10 + * Tue Apr 20 2021 Fabio Valentini - 1.0.3-4 - Include upstream patches for vala 0.52 support. From 329bc1e86c7e1f609ccb57704ecc614ab76b93b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:16:00 +0000 Subject: [PATCH 65/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 86c479b..6a0fcc5 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -147,6 +147,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.0.3-5 - Rebuilt for Python 3.10 From de03a8e2dffcfc83a9ebc332ad86c7ea410fccad Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Jan 2022 21:53:06 +0100 Subject: [PATCH 66/91] update to version 1.0.4 --- .gitignore | 1 + 0001-use-genericarray-api-only.patch | 25 - 0002-fix-syntax-of-namespace-docs.patch | 24 - 0003-sync-custom-g-assert-cmp-bindings.patch | 611 ------------------- sources | 2 +- zeitgeist.spec | 14 +- 6 files changed, 8 insertions(+), 669 deletions(-) delete mode 100644 0001-use-genericarray-api-only.patch delete mode 100644 0002-fix-syntax-of-namespace-docs.patch delete mode 100644 0003-sync-custom-g-assert-cmp-bindings.patch diff --git a/.gitignore b/.gitignore index 088f0ad..56ab76b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-1.0.1.tar.xz /zeitgeist-1.0.2.tar.xz /zeitgeist-1.0.3.tar.xz +/zeitgeist-1.0.4.tar.xz diff --git a/0001-use-genericarray-api-only.patch b/0001-use-genericarray-api-only.patch deleted file mode 100644 index 818df66..0000000 --- a/0001-use-genericarray-api-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 64ac3a6f94cd299e5e14945dc31b48f009dec152 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 30 Dec 2020 16:50:32 +0100 -Subject: Use GenericArray API only - ---- - libzeitgeist/where-clause.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala -index 204e9b1..c3e6fa6 100644 ---- a/libzeitgeist/where-clause.vala -+++ b/libzeitgeist/where-clause.vala -@@ -216,7 +216,7 @@ namespace Zeitgeist - #else - long[] pointers = new long[gptrarr.length + 1]; - #endif -- Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, -+ Memory.copy(pointers, (void*) gptrarr.data, - gptrarr.length * sizeof (void *)); - return (T[]) pointers; - } --- -cgit v1.1 - diff --git a/0002-fix-syntax-of-namespace-docs.patch b/0002-fix-syntax-of-namespace-docs.patch deleted file mode 100644 index c0cf032..0000000 --- a/0002-fix-syntax-of-namespace-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5d26650f0da9d47ce69cd9b739ad7a6990071f39 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 30 Dec 2020 16:56:17 +0100 -Subject: Fix syntax of namespace documentation block - ---- - libzeitgeist/log.vala | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala -index 9b488af..53cd4f5 100644 ---- a/libzeitgeist/log.vala -+++ b/libzeitgeist/log.vala -@@ -29,6 +29,7 @@ - * - * Its main component is the Zeitgeist engine, a D-Bus service that logs - * any events other applications send to it. An event may be anything like: -+ * - * - The user opened/created/modified/closed a file, or visited a website. - * - The user received an e-mail, a phone call or an IM notification. - * - Someone modified a remote (eg. Google Drive) document owned by the user. --- -cgit v1.1 - diff --git a/0003-sync-custom-g-assert-cmp-bindings.patch b/0003-sync-custom-g-assert-cmp-bindings.patch deleted file mode 100644 index 138f5a4..0000000 --- a/0003-sync-custom-g-assert-cmp-bindings.patch +++ /dev/null @@ -1,611 +0,0 @@ -From 702fdbac0e9174d9627813a267764c7448bc919f Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 30 Dec 2020 17:12:44 +0100 -Subject: Sync custom g_assert_cmp* bindings with vala 0.52 and use them as - needed - ---- - test/direct/assertions.vapi | 32 +++++---- - test/direct/datamodel-test.vala | 2 +- - test/direct/datasource-test.vala | 20 +++--- - test/direct/event-test.vala | 142 ++++++++++++++++++------------------- - test/direct/marshalling-test.vala | 6 +- - test/direct/mimetype-test.vala | 16 ++--- - test/direct/symbol-test.vala | 10 +-- - test/direct/table-lookup-test.vala | 14 ++-- - test/direct/where-clause-test.vala | 30 ++++---- - 9 files changed, 137 insertions(+), 135 deletions(-) - -diff --git a/test/direct/assertions.vapi b/test/direct/assertions.vapi -index 5848434..f3aebb8 100644 ---- a/test/direct/assertions.vapi -+++ b/test/direct/assertions.vapi -@@ -1,23 +1,25 @@ - [CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "glib.h")] - namespace Assertions { -- public enum OperatorType { -+#if !VALA_0_52 -+ public enum CompareOperator { - [CCode (cname = "==")] -- EQUAL, -+ EQ, - [CCode (cname = "!=")] -- NOT_EQUAL, -- [CCode (cname = "<")] -- LESS_THAN, -- [CCode (cname = ">")] -- GREATER_THAN, -- [CCode (cname = "<=")] -- LESS_OR_EQUAL, -+ NE, - [CCode (cname = ">=")] -- GREATER_OR_EQUAL -+ GE, -+ [CCode (cname = "<=")] -+ LE, -+ [CCode (cname = ">")] -+ GT, -+ [CCode (cname = "<")] -+ LT - } - -- public void assert_cmpstr (string? s1, OperatorType op, string? s2); -- public void assert_cmpint (int n1, OperatorType op, int n2); -- public void assert_cmpuint (uint n1, OperatorType op, uint n2); -- public void assert_cmphex (uint n1, OperatorType op, uint n2); -- public void assert_cmpfloat (float n1, OperatorType op, float n2); -+ public void assert_cmpstr (string? s1, CompareOperator op, string? s2); -+ public void assert_cmpint (int n1, CompareOperator op, int n2); -+ public void assert_cmpuint (uint n1, CompareOperator op, uint n2); -+ public void assert_cmphex (uint n1, CompareOperator op, uint n2); -+ public void assert_cmpfloat (double n1, CompareOperator op, double n2); -+#endif - } -diff --git a/test/direct/datamodel-test.vala b/test/direct/datamodel-test.vala -index 4fc0304..036e075 100644 ---- a/test/direct/datamodel-test.vala -+++ b/test/direct/datamodel-test.vala -@@ -113,7 +113,7 @@ void foreach_test () - int i = 0; - foreach (Event e in result_set) - { -- assert_cmpint ((int) e.id, OperatorType.EQUAL, i); -+ assert_cmpint ((int) e.id, CompareOperator.EQ, i); - i++; - } - -diff --git a/test/direct/datasource-test.vala b/test/direct/datasource-test.vala -index c9066f4..c15c92c 100644 ---- a/test/direct/datasource-test.vala -+++ b/test/direct/datasource-test.vala -@@ -35,9 +35,9 @@ int main (string[] argv) - void create_empty_test () - { - var src = new DataSource (); -- assert_cmpstr (src.unique_id, OperatorType.EQUAL, null); -- assert_cmpstr (src.name, OperatorType.EQUAL, null); -- assert_cmpstr (src.description, OperatorType.EQUAL, null); -+ assert_cmpstr (src.unique_id, CompareOperator.EQ, null); -+ assert_cmpstr (src.name, CompareOperator.EQ, null); -+ assert_cmpstr (src.description, CompareOperator.EQ, null); - assert (src.event_templates == null); - assert (src.running == false); - assert (src.timestamp == 0); -@@ -48,9 +48,9 @@ void create_full_test () - { - var src = new DataSource.full ("my-id", "my-name", "my-desc", null); - -- assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); -- assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); -- assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); -+ assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); -+ assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); -+ assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); - assert (src.event_templates == null); - assert (src.running == false); - assert (src.timestamp == 0); -@@ -81,16 +81,16 @@ void to_from_variant_test () - orig.event_templates = event_templates; - - var src = new DataSource.from_variant (orig.to_variant ()); -- assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); -- assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); -- assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); -+ assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); -+ assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); -+ assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); - assert (src.event_templates != null); - assert (src.running == false); - assert (src.timestamp == now); - assert (src.enabled == true); - - event_templates = src.event_templates; -- assert_cmpint (event_templates.length, OperatorType.EQUAL, 1); -+ assert_cmpint (event_templates.length, CompareOperator.EQ, 1); - assert (event_templates.get (0) is Event); - } - -diff --git a/test/direct/event-test.vala b/test/direct/event-test.vala -index 7189057..b47ddb8 100644 ---- a/test/direct/event-test.vala -+++ b/test/direct/event-test.vala -@@ -46,11 +46,11 @@ void create_empty_test () - - assert (ev.id == 0); - assert (ev.timestamp == 0); -- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, null); -- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, null); -- assert_cmpstr (ev.actor, OperatorType.EQUAL, null); -- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); -- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 0); -+ assert_cmpstr (ev.interpretation, CompareOperator.EQ, null); -+ assert_cmpstr (ev.manifestation, CompareOperator.EQ, null); -+ assert_cmpstr (ev.actor, CompareOperator.EQ, null); -+ assert_cmpstr (ev.origin, CompareOperator.EQ, null); -+ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 0); - assert (ev.payload == null); - } - -@@ -65,22 +65,22 @@ void create_full_test () - - assert (ev.id == 0); - assert (ev.timestamp == 0); -- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); -- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); -- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://firefox.desktop"); -- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); -- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 2); -+ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); -+ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); -+ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://firefox.desktop"); -+ assert_cmpstr (ev.origin, CompareOperator.EQ, null); -+ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 2); - assert (ev.payload == null); - - var su = ev.subjects[1]; -- assert_cmpstr (su.uri, OperatorType.EQUAL, null); -- assert_cmpstr (su.interpretation, OperatorType.EQUAL, null); -- assert_cmpstr (su.manifestation, OperatorType.EQUAL, null); -- assert_cmpstr (su.mimetype, OperatorType.EQUAL, null); -- assert_cmpstr (su.origin, OperatorType.EQUAL, null); -- assert_cmpstr (su.text, OperatorType.EQUAL, null); -- assert_cmpstr (su.storage, OperatorType.EQUAL, null); -- assert_cmpstr (su.current_uri, OperatorType.EQUAL, null); -+ assert_cmpstr (su.uri, CompareOperator.EQ, null); -+ assert_cmpstr (su.interpretation, CompareOperator.EQ, null); -+ assert_cmpstr (su.manifestation, CompareOperator.EQ, null); -+ assert_cmpstr (su.mimetype, CompareOperator.EQ, null); -+ assert_cmpstr (su.origin, CompareOperator.EQ, null); -+ assert_cmpstr (su.text, CompareOperator.EQ, null); -+ assert_cmpstr (su.storage, CompareOperator.EQ, null); -+ assert_cmpstr (su.current_uri, CompareOperator.EQ, null); - } - - void actor_from_app_info_test () -@@ -90,7 +90,7 @@ void actor_from_app_info_test () - - var ev = new Event (); - ev.set_actor_from_app_info (appinfo); -- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://test.desktop"); -+ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://test.desktop"); - } - - void from_variant_test () -@@ -139,26 +139,26 @@ void from_variant_test () - - assert (ev.id == 27); - assert (ev.timestamp == 68); -- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); -- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); -- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); -- assert_cmpstr (ev.origin, OperatorType.EQUAL, null); -- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); -+ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); -+ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); -+ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); -+ assert_cmpstr (ev.origin, CompareOperator.EQ, null); -+ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); - - var su = ev.subjects[0]; -- assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); -- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); -- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); -- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); -- assert_cmpstr (su.origin, OperatorType.EQUAL, "file://tmp"); -- assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); -+ assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); -+ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); -+ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); -+ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); -+ assert_cmpstr (su.origin, CompareOperator.EQ, "file://tmp"); -+ assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); - - var payload = ev.payload; - assert (payload != null); -- assert_cmpuint (payload.len, OperatorType.EQUAL, 3); -- assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); -- assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); -- assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); -+ assert_cmpuint (payload.len, CompareOperator.EQ, 3); -+ assert_cmpint (payload.data[0], CompareOperator.EQ, 1); -+ assert_cmpint (payload.data[1], CompareOperator.EQ, 2); -+ assert_cmpint (payload.data[2], CompareOperator.EQ, 3); - } - - void from_variant_with_new_fields_test () -@@ -210,29 +210,29 @@ void from_variant_with_new_fields_test () - - assert (ev.id == 27); - assert (ev.timestamp == 68); -- assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); -- assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); -- assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); -- assert_cmpstr (ev.origin, OperatorType.EQUAL, "origin"); -- assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); -+ assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); -+ assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); -+ assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); -+ assert_cmpstr (ev.origin, CompareOperator.EQ, "origin"); -+ assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); - - var su = ev.subjects[0]; -- assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); -- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); -- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); -- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); -- assert_cmpstr (su.origin, OperatorType.EQUAL, "file:///tmp"); -- assert_cmpstr (su.text, OperatorType.EQUAL, "foo.text"); -- assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); -- assert_cmpstr (su.current_uri, OperatorType.EQUAL, "file:///tmp/current.txt"); -- assert_cmpstr (su.current_origin, OperatorType.EQUAL, "file:///tmp1"); -+ assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); -+ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); -+ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); -+ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); -+ assert_cmpstr (su.origin, CompareOperator.EQ, "file:///tmp"); -+ assert_cmpstr (su.text, CompareOperator.EQ, "foo.text"); -+ assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); -+ assert_cmpstr (su.current_uri, CompareOperator.EQ, "file:///tmp/current.txt"); -+ assert_cmpstr (su.current_origin, CompareOperator.EQ, "file:///tmp1"); - - var payload = ev.payload; - assert (payload != null); -- assert_cmpuint (payload.len, OperatorType.EQUAL, 3); -- assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); -- assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); -- assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); -+ assert_cmpuint (payload.len, CompareOperator.EQ, 3); -+ assert_cmpint (payload.data[0], CompareOperator.EQ, 1); -+ assert_cmpint (payload.data[1], CompareOperator.EQ, 2); -+ assert_cmpint (payload.data[2], CompareOperator.EQ, 3); - - } - -@@ -252,11 +252,11 @@ void empty_to_from_variant_test () - - assert (marshalled.id == 0); - assert (marshalled.timestamp == orig.timestamp); -- assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, null); -- assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, null); -- assert_cmpstr (marshalled.actor, OperatorType.EQUAL, null); -- assert_cmpstr (marshalled.origin, OperatorType.EQUAL, null); -- assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 0); -+ assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, null); -+ assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, null); -+ assert_cmpstr (marshalled.actor, CompareOperator.EQ, null); -+ assert_cmpstr (marshalled.origin, CompareOperator.EQ, null); -+ assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 0); - assert (marshalled.payload == null); - } - -@@ -278,11 +278,11 @@ void with_one_subject_to_from_variant_test () - var marshalled = new Event.from_variant (orig.to_variant ()); - - assert (marshalled.id == 0); -- assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); -- assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); -- assert_cmpstr (marshalled.actor, OperatorType.EQUAL, "application://firefox.desktop"); -- assert_cmpstr (marshalled.origin, OperatorType.EQUAL, "origin"); -- assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 1); -+ assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); -+ assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); -+ assert_cmpstr (marshalled.actor, CompareOperator.EQ, "application://firefox.desktop"); -+ assert_cmpstr (marshalled.origin, CompareOperator.EQ, "origin"); -+ assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 1); - - payload = marshalled.payload; - assert (payload != null); -@@ -290,14 +290,14 @@ void with_one_subject_to_from_variant_test () - assert (payload.data[0] == 255); - - var su = marshalled.subjects[0]; -- assert_cmpstr (su.uri, OperatorType.EQUAL, "http://example.com"); -- assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.WEBSITE); -- assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.REMOTE_DATA_OBJECT); -- assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/html"); -- assert_cmpstr (su.origin, OperatorType.EQUAL, "http://example.com"); -- assert_cmpstr (su.text, OperatorType.EQUAL, "example.com"); -- assert_cmpstr (su.storage, OperatorType.EQUAL, "net"); -- assert_cmpstr (su.current_uri, OperatorType.EQUAL, "http://current-example.com"); -+ assert_cmpstr (su.uri, CompareOperator.EQ, "http://example.com"); -+ assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.WEBSITE); -+ assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.REMOTE_DATA_OBJECT); -+ assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/html"); -+ assert_cmpstr (su.origin, CompareOperator.EQ, "http://example.com"); -+ assert_cmpstr (su.text, CompareOperator.EQ, "example.com"); -+ assert_cmpstr (su.storage, CompareOperator.EQ, "net"); -+ assert_cmpstr (su.current_uri, CompareOperator.EQ, "http://current-example.com"); - } - - void three_events_to_from_variant_test () -@@ -324,7 +324,7 @@ void zero_events_to_from_variant_test () - var vevents = Events.to_variant (events); - assert (vevents.n_children () == 0); - events = Events.from_variant (vevents); -- assert_cmpint (events.length, OperatorType.EQUAL, 0); -+ assert_cmpint (events.length, CompareOperator.EQ, 0); - } - - // vim:expandtab:ts=4:sw=4 -diff --git a/test/direct/marshalling-test.vala b/test/direct/marshalling-test.vala -index befe39b..a611fe1 100644 ---- a/test/direct/marshalling-test.vala -+++ b/test/direct/marshalling-test.vala -@@ -98,7 +98,7 @@ void events_test () - Variant vevents = Events.to_variant (events); - - var demarshalled = Events.from_variant (vevents); -- assert_cmpint (demarshalled.length, OperatorType.EQUAL, 1000); -+ assert_cmpint (demarshalled.length, CompareOperator.EQ, 1000); - } - - void timerange_test () -@@ -107,8 +107,8 @@ void timerange_test () - { - Variant v = new Variant("(xx)", i, i+42); - TimeRange timerange = new TimeRange.from_variant (v); -- assert_cmpint ((int) timerange.start, OperatorType.EQUAL, (int)i); -- assert_cmpint ((int) timerange.end, OperatorType.EQUAL, (int)i+42); -+ assert_cmpint ((int) timerange.start, CompareOperator.EQ, (int)i); -+ assert_cmpint ((int) timerange.end, CompareOperator.EQ, (int)i+42); - } - } - -diff --git a/test/direct/mimetype-test.vala b/test/direct/mimetype-test.vala -index f0b1bf0..327e4f7 100644 ---- a/test/direct/mimetype-test.vala -+++ b/test/direct/mimetype-test.vala -@@ -42,18 +42,18 @@ int main (string[] args) - - public void mime_type_basic_test () - { -- assert_cmpstr (NFO.TEXT_DOCUMENT, OperatorType.EQUAL, -+ assert_cmpstr (NFO.TEXT_DOCUMENT, CompareOperator.EQ, - interpretation_for_mimetype ("text/plain")); - } - - public void mime_type_regex_test () - { - // We should have a fallack for application/x-applix-* -- assert_cmpstr (NFO.DOCUMENT, OperatorType.EQUAL, -+ assert_cmpstr (NFO.DOCUMENT, CompareOperator.EQ, - interpretation_for_mimetype ("application/x-applix-FOOBAR")); - - // Still application/x-applix-speadsheet should be a spreadsheet -- assert_cmpstr (NFO.SPREADSHEET, OperatorType.EQUAL, -+ assert_cmpstr (NFO.SPREADSHEET, CompareOperator.EQ, - interpretation_for_mimetype ("application/x-applix-spreadsheet")); - } - -@@ -81,17 +81,17 @@ public void mime_type_registration_test () - mime_type_regex_test (); - mime_type_none_test (); - -- assert_cmpstr ("Bluebird", OperatorType.EQUAL, -+ assert_cmpstr ("Bluebird", CompareOperator.EQ, - interpretation_for_mimetype ("awesome/bird")); -- assert_cmpstr ("is nothing", OperatorType.EQUAL, -+ assert_cmpstr ("is nothing", CompareOperator.EQ, - interpretation_for_mimetype ("everything/everywhere")); - } - - public void uri_scheme_basic_test () - { -- assert_cmpstr (NFO.FILE_DATA_OBJECT, OperatorType.EQUAL, -+ assert_cmpstr (NFO.FILE_DATA_OBJECT, CompareOperator.EQ, - manifestation_for_uri ("file:///tmp/foo.txt")); -- assert_cmpstr (NFO.REMOTE_DATA_OBJECT, OperatorType.EQUAL, -+ assert_cmpstr (NFO.REMOTE_DATA_OBJECT, CompareOperator.EQ, - manifestation_for_uri ("ftp://ftp.example.com")); - } - -@@ -107,7 +107,7 @@ public void uri_scheme_registration_test () - uri_scheme_basic_test (); - uri_scheme_none_test (); - -- assert_cmpstr ("the answer", OperatorType.EQUAL, -+ assert_cmpstr ("the answer", CompareOperator.EQ, - manifestation_for_uri ("42://what is it?")); - } - -diff --git a/test/direct/symbol-test.vala b/test/direct/symbol-test.vala -index e47024d..0261fe8 100644 ---- a/test/direct/symbol-test.vala -+++ b/test/direct/symbol-test.vala -@@ -100,7 +100,7 @@ void is_uri_valid (string uri) - void media_children_test () - { - var children = Symbol.get_children (NFO.MEDIA); -- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); -+ assert_cmpuint (children.length (), CompareOperator.GT, 0); - foreach (string uri in children) - is_uri_valid (uri); - } -@@ -108,7 +108,7 @@ void media_children_test () - void media_all_children_test () - { - var children = Symbol.get_all_children (NFO.MEDIA); -- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); -+ assert_cmpuint (children.length (), CompareOperator.GT, 0); - foreach (string uri in children) - is_uri_valid (uri); - } -@@ -116,7 +116,7 @@ void media_all_children_test () - void vector_image_parents_test () - { - var parents = Symbol.get_all_parents (NFO.VECTOR_IMAGE); -- assert_cmpuint (parents.length (), OperatorType.GREATER_THAN, 0); -+ assert_cmpuint (parents.length (), CompareOperator.GT, 0); - foreach (string uri in parents) - is_uri_valid (uri); - } -@@ -126,8 +126,8 @@ void media_complex_test () - var children = Symbol.get_children (NFO.MEDIA); - var all_ch = Symbol.get_all_children (NFO.MEDIA); - -- assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); -- assert_cmpuint (all_ch.length (), OperatorType.GREATER_THAN, children.length ()); -+ assert_cmpuint (children.length (), CompareOperator.GT, 0); -+ assert_cmpuint (all_ch.length (), CompareOperator.GT, children.length ()); - - foreach (string uri in children) - { -diff --git a/test/direct/table-lookup-test.vala b/test/direct/table-lookup-test.vala -index 0ce51ef..a5e25e1 100644 ---- a/test/direct/table-lookup-test.vala -+++ b/test/direct/table-lookup-test.vala -@@ -58,15 +58,15 @@ public void basic_test () - TableLookup table_lookup = new TableLookup (database, "actor"); - - int id = table_lookup.id_for_string ("1st-actor"); -- assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); -- assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id); -+ assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); -+ assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id); - - int rc = db.exec ("DELETE FROM actor WHERE value='1st-actor'"); - assert (rc == Sqlite.OK); - - table_lookup.remove (1); -- assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); -- assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id+2); -+ assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); -+ assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id+2); - } - - public void get_value_with_query_test () -@@ -78,7 +78,7 @@ public void get_value_with_query_test () - int rc = db.exec ("INSERT INTO actor (id, value) VALUES (100, 'new-actor')"); - assert (rc == Sqlite.OK); - -- assert_cmpstr (table_lookup.get_value (100), OperatorType.EQUAL, "new-actor"); -+ assert_cmpstr (table_lookup.get_value (100), CompareOperator.EQ, "new-actor"); - } - - public void engine_test () -@@ -88,14 +88,14 @@ public void engine_test () - unowned Sqlite.Database db = database.database; - TableLookup table_lookup = engine.get_actors_table_lookup(); - -- assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 1); -+ assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 1); - - // Since we're running with Engine, this should trigger the deletion - // callback, which in turn should fix the cache (LP: #598666). - int rc = db.exec ("DELETE FROM actor WHERE value='something'"); - assert (rc == Sqlite.OK); - -- assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 2); -+ assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 2); - } - - // vim:expandtab:ts=4:sw=4 -diff --git a/test/direct/where-clause-test.vala b/test/direct/where-clause-test.vala -index e746daf..831a8c1 100644 ---- a/test/direct/where-clause-test.vala -+++ b/test/direct/where-clause-test.vala -@@ -59,16 +59,16 @@ public void basic_test () - where = new WhereClause (WhereClause.Type.AND); - where.add ("1st condition"); - where.add ("2nd condition"); -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition AND 2nd condition)"); -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition AND 2nd condition)"); - - where = new WhereClause (WhereClause.Type.OR); - where.add ("1st condition"); - where.add ("2nd condition"); -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition OR 2nd condition)"); -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition OR 2nd condition)"); - - where = new WhereClause (WhereClause.Type.AND, true); - where.add ("some condition"); -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "NOT some condition"); -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "NOT some condition"); - } - - public void nested_test () -@@ -88,16 +88,16 @@ public void nested_test () - where.extend (subwhere); - where.add ("last condition"); - -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, - "(1st condition AND (2nd condition OR 3rd condition) AND " + - "last condition)"); - - { - var args = where.get_bind_arguments (); -- assert_cmpint (args.length, OperatorType.EQUAL, 3); -- assert_cmpstr (args[0], OperatorType.EQUAL, "arg1"); -- assert_cmpstr (args[1], OperatorType.EQUAL, "arg2"); -- assert_cmpstr (args[2], OperatorType.EQUAL, "arg3"); -+ assert_cmpint (args.length, CompareOperator.EQ, 3); -+ assert_cmpstr (args[0], CompareOperator.EQ, "arg1"); -+ assert_cmpstr (args[1], CompareOperator.EQ, "arg2"); -+ assert_cmpstr (args[2], CompareOperator.EQ, "arg3"); - } - } - -@@ -112,7 +112,7 @@ public void nested_negation_test () - where.extend (subwhere); - where.add ("cond3"); - -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, - "(cond1 OR NOT cond2 OR cond3)"); - } - -@@ -123,14 +123,14 @@ public void match_condition_test () - // Plain - where = new WhereClause (WhereClause.Type.AND); - where.add_match_condition ("field1", 5); -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, - "field1 = 5"); -- assert_cmpint (where.get_bind_arguments ().length, OperatorType.EQUAL, 0); -+ assert_cmpint (where.get_bind_arguments ().length, CompareOperator.EQ, 0); - - // Negation - where = new WhereClause (WhereClause.Type.AND); - where.add_match_condition ("f2", 3, true); -- assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "f2 != 3"); -+ assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "f2 != 3"); - - // FIXME: test LIKE stuff... - } -@@ -138,9 +138,9 @@ public void match_condition_test () - public void right_boundary_test () - { - var clause = new PublicWhereClause (WhereClause.Type.AND); -- assert_cmpstr (clause.get_right_boundary ("a"), OperatorType.EQUAL, "b"); -- assert_cmpstr (clause.get_right_boundary ("hello"), OperatorType.EQUAL, "hellp"); -- assert_cmpstr (clause.get_right_boundary ("a b"), OperatorType.EQUAL, "a c"); -+ assert_cmpstr (clause.get_right_boundary ("a"), CompareOperator.EQ, "b"); -+ assert_cmpstr (clause.get_right_boundary ("hello"), CompareOperator.EQ, "hellp"); -+ assert_cmpstr (clause.get_right_boundary ("a b"), CompareOperator.EQ, "a c"); - } - - // vim:expandtab:ts=4:sw=4 --- -cgit v1.1 - diff --git a/sources b/sources index 99456c5..cf017f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.3.tar.xz) = 79ff0972d1bc228ca5f1df63ee52b7b9b732f4e0a5d74db22b94c5066fb3e5fc02fd491b9e7571d1d215adad4fe11010aa5ad398abbd2f159dde5c88015afb33 +SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b diff --git a/zeitgeist.spec b/zeitgeist.spec index 6a0fcc5..3c8a592 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0.3 -Release: 6%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -14,14 +14,9 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz -# include upstream patches for vala 0.52 support -Patch1: 0001-use-genericarray-api-only.patch -Patch2: 0002-fix-syntax-of-namespace-docs.patch -Patch3: 0003-sync-custom-g-assert-cmp-bindings.patch - -BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-rdflib BuildRequires: systemd @@ -147,6 +142,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Wed Jan 12 2022 Fabio Valentini - 1.0.4-1 +- Update to version 1.0.4. + * Fri Jul 23 2021 Fedora Release Engineering - 1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c3c3c3af2390df80a0aae3ac1c99470cae1fdfc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:49:39 +0000 Subject: [PATCH 67/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 3c8a592..a0d5781 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -142,6 +142,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 12 2022 Fabio Valentini - 1.0.4-1 - Update to version 1.0.4. From 4965e18560a5badf1b1766331162fed81974a77b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 21:47:18 +0200 Subject: [PATCH 68/91] Rebuilt for Python 3.11 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index a0d5781..98739cf 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -142,6 +142,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Mon Jun 13 2022 Python Maint - 1.0.4-3 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 09518194d56dd4f911c2b18f5783a90403acdf0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:53:14 +0000 Subject: [PATCH 69/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 98739cf..ecd4734 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -142,6 +142,9 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.0.4-3 - Rebuilt for Python 3.11 From e3e9b52a967f00f30d7d1c7119cb75f16680c19b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Sep 2022 23:15:54 +0900 Subject: [PATCH 70/91] Make make check error fatal Disable tests currently hard to get passed Make main package EVR aware for -libs subpackage --- zeitgeist.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index ecd4734..28659b1 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -34,6 +34,7 @@ BuildRequires: pkgconfig(telepathy-glib) %{?systemd_requires} Requires: dbus +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: zeitgeist-datahub < 0.9.5-4 Obsoletes: python2-%{name} < 1.0.2-1 @@ -80,6 +81,12 @@ developing applications that use %{name}. ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +# The following two are hard to get enabled... +sed -i.disable test/direct/Makefile.in \ + -e 's|log-test\$(EXEEXT) \\|\\|' +sed -i.disable test/c/Makefile.in \ + -e 's|test-log\$(EXEEXT) \\|\\|' + %build %configure --enable-fts --enable-datahub --disable-silent-rules %make_build @@ -93,7 +100,7 @@ find %{buildroot} -name '*.la' -delete -print rm -frv %{buildroot}%{_datadir}/zeitgeist/doc %check -make check || true +make check %post %systemd_user_post %{name}.service @@ -109,6 +116,7 @@ make check || true %files %doc AUTHORS NEWS %license COPYING COPYING.GPL + %{_bindir}/zeitgeist-daemon %{_bindir}/zeitgeist-datahub %{_libexecdir}/%{name}/ @@ -142,6 +150,11 @@ make check || true %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Sep 8 2022 Mamoru TASAKA - 1.0.4-5 +- Make make check error fatal +- Disable tests currently hard to get passed +- Make main package EVR aware for -libs subpackage + * Sat Jul 23 2022 Fedora Release Engineering - 1.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b16e1bb0051e4b837c9ea42bcdd5da67922a75b5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Sep 2022 11:30:11 +0900 Subject: [PATCH 71/91] some newline --- zeitgeist.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 28659b1..0620d88 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -114,18 +114,22 @@ make check %files -%doc AUTHORS NEWS -%license COPYING COPYING.GPL +%doc AUTHORS +%doc NEWS +%license COPYING +%license COPYING.GPL %{_bindir}/zeitgeist-daemon %{_bindir}/zeitgeist-datahub %{_libexecdir}/%{name}/ + %{_datadir}/%{name}/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/zeitgeist-daemon %{_mandir}/man1/zeitgeist-*.* + %config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop %{_userunitdir}/%{name}.service %{_userunitdir}/%{name}-fts.service @@ -142,6 +146,7 @@ make check %{_includedir}/zeitgeist-2.0/ %{_libdir}/libzeitgeist-2.0.so %{_libdir}/pkgconfig/zeitgeist-2.0.pc + %{_datadir}/gir-1.0/Zeitgeist-2.0.gir %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi From cbeb23e65baddc75b9ea2a5fd48f8f8cb4374b51 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 10 Sep 2022 22:07:20 +0900 Subject: [PATCH 72/91] Upstream patch: datahub: Fix wrong parameter for Event.full() ctor (Upstream bug 19, RH bug 1779103) --- ...-wrong-parameter-for-Event.full-ctor.patch | 39 +++++++++++++++++++ zeitgeist.spec | 9 ++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch diff --git a/zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch b/zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch new file mode 100644 index 0000000..711c6a9 --- /dev/null +++ b/zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch @@ -0,0 +1,39 @@ +From 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Fri, 9 Sep 2022 14:49:27 +0200 +Subject: [PATCH] datahub: Fix wrong parameter for Event.full() ctor + +Thanks to Mamoru TASAKA + +Fixes https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19 +--- + datahub/telepathy-observer.vala | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/datahub/telepathy-observer.vala b/datahub/telepathy-observer.vala +index cd670d06..bb34581c 100644 +--- a/datahub/telepathy-observer.vala ++++ b/datahub/telepathy-observer.vala +@@ -96,8 +96,7 @@ public class TelepathyObserver : DataProvider + ZG.ACCESS_EVENT, + "", + actor, +- null, +- obj_path); ++ null, null); + + /* + * Whether user initiated the chat or not +@@ -217,8 +216,7 @@ public class TelepathyObserver : DataProvider + ZG.ACCESS_EVENT, + ZG.USER_ACTIVITY, + actor, +- null, +- obj_path); ++ null, null); + if (!channel.requested) + event_template.manifestation = ZG.WORLD_ACTIVITY; + /* +-- +2.37.3 + diff --git a/zeitgeist.spec b/zeitgeist.spec index 0620d88..7353452 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -13,6 +13,9 @@ License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz +# https://bugzilla.redhat.com/show_bug.cgi?id=1779103 +# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19 +Patch1: %{name}-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch BuildRequires: gcc-c++ BuildRequires: gettext @@ -155,6 +158,10 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Sep 10 2022 Mamoru TASAKA - 1.0.4-6 +- Upstream patch: datahub: Fix wrong parameter for Event.full() ctor + (Upstream bug 19, RH bug 1779103) + * Thu Sep 8 2022 Mamoru TASAKA - 1.0.4-5 - Make make check error fatal - Disable tests currently hard to get passed From 93de2acd7bb7eefcabe47aa0904a9d10a5b25abf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 11 Jan 2023 16:01:48 +0900 Subject: [PATCH 73/91] F-37+: Replace inspect.getargspec removed on python3.11 (bug 2159916) --- zeitgeist.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 7353452..fd71d55 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -90,6 +90,14 @@ sed -i.disable test/direct/Makefile.in \ sed -i.disable test/c/Makefile.in \ -e 's|test-log\$(EXEEXT) \\|\\|' +# python 3.11 removes inspect.getargspec (bug 2159916) +# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/26 +# https://docs.python.org/3.11/whatsnew/3.11.html#removed +%if 0%{?fedora} >= 37 +sed -i.py311 python/client.py \ + -e 's|inspect.getargspec|inspect.getfullargspec|' +%endif + %build %configure --enable-fts --enable-datahub --disable-silent-rules %make_build @@ -158,6 +166,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Wed Jan 11 2023 Mamoru TASAKA - 1.0.4-7 +- F-37+: Replace inspect.getargspec removed on python3.11 (bug 2159916) + * Sat Sep 10 2022 Mamoru TASAKA - 1.0.4-6 - Upstream patch: datahub: Fix wrong parameter for Event.full() ctor (Upstream bug 19, RH bug 1779103) From a7c9b74297c0b8152a4b1d058b6899cc1534364a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:13:48 +0000 Subject: [PATCH 74/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index fd71d55..5dc3cb3 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -166,6 +166,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 11 2023 Mamoru TASAKA - 1.0.4-7 - F-37+: Replace inspect.getargspec removed on python3.11 (bug 2159916) From 89bace310ab6773a75b59d69fb791ab9694d112e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 17:00:47 +0200 Subject: [PATCH 75/91] Rebuilt for Python 3.12 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 5dc3cb3..4e372db 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -166,6 +166,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Jun 15 2023 Python Maint - 1.0.4-9 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 48df067a878bc1545a9c6bffc2a7f5d5c3684333 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jul 2023 00:04:39 +0900 Subject: [PATCH 76/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 4e372db..c1a8283 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -166,6 +166,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 1.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 1.0.4-9 - Rebuilt for Python 3.12 From 14a5e182aa18d9dad20f36cac2b51d28814b95d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 10 Dec 2023 22:36:23 +0900 Subject: [PATCH 77/91] SPDX migration --- zeitgeist.spec | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index c1a8283..28e22c4 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,15 +1,28 @@ Name: zeitgeist Version: 1.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Framework providing Desktop activity awareness -# most of the source code is LGPLv2+, except: -# datahub/ is LGPLv3+ -# examples/c/ is GPLv3 -# extensions/fts++/ is GPLv2+ -# src/notify.vala: GPLv2+ -# test/c/ is GPLv3 -# tools/zeitgeist-explorer/ is GPLv2+ -License: LGPLv2+ and LGPLv3+ and GPLv2+ + +# data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main +# Original: https://sourceforge.net/projects/oscaf/files/shared-desktop-ontologies/0.7/shared-desktop-ontologies-0.7.1.tar.bz2/ +# See: LICENSE.CC-BY in the above tarball +# data/ontology2code LGPL-2.0-or-later +# datahub/ LGPL-3.0-or-later -> main +# doc/libzeitgeist/docs_vala/scripts.js LGPL-2.0-or-later +# examples/c/ GPL-3.0-only +# extensions/*.c LGPL-2.0-or-later +# extensions/fts++/ GPL-2.0-or-later -> main +# libzeitgeist/ LGPL-2.0-or-later +# python/*.py LGPL-2.0-or-later +# src/ (except for some files) LGPL-2.0-or-later +# src/notify.vala GPL-2.0-or-later -> main +# test/c/ GPL-3.0-only +# test/ (other files) LGPL-2.0-or-later +# tools/ (except for some files) LGPL-2.0-or-later +# tools/zeitgeist-explorer/ GPL-2.0-or-later + +# SPDX confirmed +License: LGPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-2.0-or-later AND (BSD-3-Clause OR CC-BY-SA-3.0) URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz @@ -50,6 +63,7 @@ together with several different user interfaces. %package -n python3-zeitgeist Summary: Python 3 bindings for zeitgeist +License: LGPL-2.0-or-later Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -61,7 +75,7 @@ This package contains the Python 3 bindings for zeitgeist. %package libs Summary: Client library for interacting with the Zeitgeist daemon -License: LGPLv2+ +License: LGPL-2.0-or-later %description libs Libzeitgeist is a client library for interacting with the Zeitgeist @@ -69,7 +83,7 @@ daemon. %package devel Summary: Development files for %{name} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -93,10 +107,8 @@ sed -i.disable test/c/Makefile.in \ # python 3.11 removes inspect.getargspec (bug 2159916) # https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/26 # https://docs.python.org/3.11/whatsnew/3.11.html#removed -%if 0%{?fedora} >= 37 sed -i.py311 python/client.py \ -e 's|inspect.getargspec|inspect.getfullargspec|' -%endif %build %configure --enable-fts --enable-datahub --disable-silent-rules @@ -132,9 +144,12 @@ make check %{_bindir}/zeitgeist-daemon %{_bindir}/zeitgeist-datahub -%{_libexecdir}/%{name}/ +%dir %{_libexecdir}/%{name}/ +%{_libexecdir}/%{name}/zeitgeist-fts -%{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/ontology/ +%{_datadir}/%{name}/ontology/*.trig %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions @@ -166,6 +181,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Dec 10 2023 Mamoru TASAKA - 1.0.4-11 +- SPDX migration + * Sat Jul 22 2023 Mamoru TASAKA - 1.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bdb79a7fae443c2362c915a9f1022c96a3228ca8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Jan 2024 10:44:01 +0900 Subject: [PATCH 78/91] Change -Wincompatible-pointer-types from error to warning --- zeitgeist.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 28e22c4..03f8d53 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,9 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + Name: zeitgeist Version: 1.0.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -22,7 +25,7 @@ Summary: Framework providing Desktop activity awareness # tools/zeitgeist-explorer/ GPL-2.0-or-later # SPDX confirmed -License: LGPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-2.0-or-later AND (BSD-3-Clause OR CC-BY-SA-3.0) +License: LGPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-2.0-or-later AND (BSD-3-Clause OR CC-BY-SA-3.0) URL: https://launchpad.net/zeitgeist Source0: %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz @@ -181,6 +184,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Jan 18 2024 Mamoru TASAKA - 1.0.4-12 +- Change -Wincompatible-pointer-types from error to warning + * Sun Dec 10 2023 Mamoru TASAKA - 1.0.4-11 - SPDX migration From 14a064c48abf4c677098a0e9c7d93b842c7a073b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jan 2024 20:46:13 +0900 Subject: [PATCH 79/91] Regenerate C source from Vala source and enable -Werror=incompatible-pointer-types again (Thanks to Florian Weimer ) --- zeitgeist.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 03f8d53..a48b87f 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,9 +1,6 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - Name: zeitgeist Version: 1.0.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -96,6 +93,8 @@ developing applications that use %{name}. %prep %autosetup -p1 +# Regenerate C source from vala source +find -name '*.vala' -exec touch {} \; ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -184,6 +183,11 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Jan 21 2024 Mamoru TASAKA - 1.0.4-13 +- Regenerate C source from Vala source and enable + -Werror=incompatible-pointer-types again + (Thanks to Florian Weimer ) + * Thu Jan 18 2024 Mamoru TASAKA - 1.0.4-12 - Change -Wincompatible-pointer-types from error to warning From 0e75261c66d96ff9d8e7dcc55c6b328c52a6a5a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:03:48 +0000 Subject: [PATCH 80/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index a48b87f..c7b6e6c 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -183,6 +183,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Mamoru TASAKA - 1.0.4-13 - Regenerate C source from Vala source and enable -Werror=incompatible-pointer-types again From 79abd0f865121098b547b371840c778c83d39ada Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 16 Jun 2024 09:18:56 +0200 Subject: [PATCH 81/91] Rebuilt for Python 3.13 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index c7b6e6c..ef20c2f 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -183,6 +183,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Jun 16 2024 Python Maint - 1.0.4-15 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 1.0.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ade8afe126c3b464df047bb272fe7d9cc0bb40c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:50:07 +0000 Subject: [PATCH 82/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index ef20c2f..e2b81c8 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -183,6 +183,9 @@ make check %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 16 2024 Python Maint - 1.0.4-15 - Rebuilt for Python 3.13 From bd7757ef4d9b82238625f98147410c4b0541c818 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Aug 2024 14:44:25 +0900 Subject: [PATCH 83/91] execute test program which require dbus and zeitgeist-daemon execute test program which require dbus and zeitgeist-daemon execute test program which require dbus and zeitgeist-daemon execute test program which require dbus and zeitgeist-daemon --- zeitgeist.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index e2b81c8..e341c30 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -47,6 +47,8 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: /usr/bin/dbus-run-session + %{?systemd_requires} Requires: dbus @@ -101,10 +103,12 @@ find -name '*.vala' -exec touch {} \; sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure # The following two are hard to get enabled... +%if 0 sed -i.disable test/direct/Makefile.in \ -e 's|log-test\$(EXEEXT) \\|\\|' sed -i.disable test/c/Makefile.in \ -e 's|test-log\$(EXEEXT) \\|\\|' +%endif # python 3.11 removes inspect.getargspec (bug 2159916) # https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/26 @@ -125,7 +129,20 @@ find %{buildroot} -name '*.la' -delete -print rm -frv %{buildroot}%{_datadir}/zeitgeist/doc %check -make check +cat > test-script < - 1.0.4-17 +- execute test program which require dbus and zeitgeist-daemon + * Sat Jul 20 2024 Fedora Release Engineering - 1.0.4-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 76bcac0773a3496407428a0055b2f0d26f94480f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:43:49 +0000 Subject: [PATCH 84/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index e341c30..8632dfc 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Aug 16 2024 Mamoru TASAKA - 1.0.4-17 - execute test program which require dbus and zeitgeist-daemon From 6a79f97631ea472926c3a1706b18971cdabc6676 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 13 Jun 2025 00:44:26 +0200 Subject: [PATCH 85/91] Rebuilt for Python 3.14 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 8632dfc..142daf1 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Thu Jun 12 2025 Python Maint - 1.0.4-19 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.4-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 323a8fe2eda463203cc71ee612af4dee82d6b6a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:17:13 +0000 Subject: [PATCH 86/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 142daf1..06b5835 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 12 2025 Python Maint - 1.0.4-19 - Rebuilt for Python 3.14 From 79c51494039208cb5d29880d663c7e7684526326 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:47 +0200 Subject: [PATCH 87/91] Rebuilt for Python 3.14.0rc2 bytecode --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 06b5835..d809615 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Aug 15 2025 Python Maint - 1.0.4-21 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7fb25e01c1dadd55001ddd3d29099b972a182415 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:29 +0200 Subject: [PATCH 88/91] Rebuilt for Python 3.14.0rc3 bytecode --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index d809615..d1a2388 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Sep 19 2025 Python Maint - 1.0.4-22 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.0.4-21 - Rebuilt for Python 3.14.0rc2 bytecode From e8d46230f60b3b80438d4780350610fb64a59abf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:07:12 +0000 Subject: [PATCH 89/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index d1a2388..9a3e6d3 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 1.0.4-22 - Rebuilt for Python 3.14.0rc3 bytecode From 6948211b627083bc0c86deb75465006060420190 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 23:53:32 +0200 Subject: [PATCH 90/91] Rebuilt for Python 3.15 --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 9a3e6d3..a655509 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Wed Jun 03 2026 Python Maint - 1.0.4-24 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 1b163f7eac036bb9c9cc0fe3405b2b43c0ce50bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:39:33 +0000 Subject: [PATCH 91/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zeitgeist.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index a655509..66d1d50 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist Version: 1.0.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Framework providing Desktop activity awareness # data/ontology/*.trig BSD-3-Clause OR CC-BY-SA-3.0 -> main @@ -200,6 +200,9 @@ dbus-run-session -- ./test-script %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 1.0.4-24 - Rebuilt for Python 3.15