.gitignore

@@ -13,6 +13,3 @@ 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
-/zeitgeist-1.0.3.tar.xz
-/zeitgeist-1.0.4.tar.xz

sources

@@ -1 +1 @@
-SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b
+SHA512 (zeitgeist-1.0.1.tar.xz) = e800de89ac574af49b9449fe5cb623994ff2515ff36ba94d81f0b1eebcb93b1aeecfbde14c0dd1ea24aef36b5b69be33c2cdf2ef69fc17a69bf98b40dae80cef

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 <ricotz@ubuntu.com>
+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<string> ();
++            var results = new List<unowned string> ();
+             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<string> ();
++            var results = new List<unowned string> ();
+             var symbol = all_symbols.lookup (symbol_uri);
+             if (symbol == null) return results;
+ 
+@@ -89,7 +89,7 @@ namespace Zeitgeist
+         public static List<unowned string> get_children (string symbol_uri)
+         {
+             initialize_symbols ();
+-            var results = new List<string> ();
++            var results = new List<unowned string> ();
+             var symbol = all_symbols.lookup (symbol_uri);
+             if (symbol == null) return results;
+ 
+@@ -103,7 +103,7 @@ namespace Zeitgeist
+         {
+             initialize_symbols ();
+ 
+-            var results = new List<string>();
++            var results = new List<unowned string>();
+             var symbol = all_symbols.lookup (symbol_uri);
+             if (symbol == null) return results;
+ 
+-- 
+2.18.1
+

zeitgeist-1.0.1-fix-vapi.patch

@@ -0,0 +1,135 @@
+From 131a84f1a65a4ce8bffd94f52746425f7e96b7ae Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+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
+

zeitgeist-1.0.1-fts-vala-fix.patch

@@ -0,0 +1,122 @@
+From 4cd7031da14d4a2a291f7a176b3e6c08c49ddcef Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+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
+

zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch

@@ -1,39 +0,0 @@
-From 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-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
-

zeitgeist.spec

@@ -1,44 +1,24 @@
 Name:           zeitgeist
-Version:        1.0.4
-Release:        25%{?dist}
+Version:        1.0.1
+Release:        2%{?dist}
 Summary:        Framework providing Desktop activity awareness
-
-# 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)
-
+# 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:        %{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
+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:  gettext
-BuildRequires:  make
-BuildRequires:  python3-devel
-BuildRequires:  python3-rdflib
-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)
@@ -46,15 +26,18 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(telepathy-glib)
-
-BuildRequires:	/usr/bin/dbus-run-session
-
+BuildRequires:  gettext
+BuildRequires:  python2-devel
+BuildRequires:  python2-rdflib
+BuildRequires:  raptor2
 %{?systemd_requires}
+BuildRequires:  systemd
+BuildRequires:  vala
+BuildRequires:  xapian-core-devel
 
 Requires:       dbus
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+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,21 +46,9 @@ 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
-License:        LGPL-2.0-or-later
-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:        LGPL-2.0-or-later
+License:        LGPLv2+
 
 %description    libs
 Libzeitgeist is a client library for interacting with the Zeitgeist
@@ -85,37 +56,34 @@ daemon.
 
 %package        devel
 Summary:        Development files for %{name}
-License:        LGPL-2.0-or-later
+License:        LGPLv2+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 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
-# Regenerate C source from vala source
-find -name '*.vala' -exec touch {} \;
+
+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
 
-# 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
-# https://docs.python.org/3.11/whatsnew/3.11.html#removed
-sed -i.py311 python/client.py \
-	-e 's|inspect.getargspec|inspect.getfullargspec|'
-
 %build
 %configure --enable-fts --enable-datahub --disable-silent-rules
 %make_build
@@ -129,20 +97,7 @@ find %{buildroot} -name '*.la' -delete -print
 rm -frv %{buildroot}%{_datadir}/zeitgeist/doc
 
 %check
-cat > test-script <<EOF
-#!/bin/bash
-set -x
-
-PATH_ORIG=\${PATH}
-export PATH=\${PATH_ORIG}:%{buildroot}%{_bindir}
-export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
-
-zeitgeist-daemon &
-exec make check
-EOF
-
-chmod 0700 ./test-script
-dbus-run-session -- ./test-script
+make check || true
 
 %post
 %systemd_user_post %{name}.service
@@ -156,32 +111,21 @@ dbus-run-session -- ./test-script
 
 
 %files
-%doc AUTHORS
-%doc NEWS
-%license COPYING
-%license COPYING.GPL
-
+%doc AUTHORS NEWS
+%license COPYING COPYING.GPL
 %{_bindir}/zeitgeist-daemon
 %{_bindir}/zeitgeist-datahub
-%dir	%{_libexecdir}/%{name}/
-%{_libexecdir}/%{name}/zeitgeist-fts
-
-%dir	%{_datadir}/%{name}/
-%dir	%{_datadir}/%{name}/ontology/
-%{_datadir}/%{name}/ontology/*.trig
+%{_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
 
-%files -n python3-zeitgeist
-%{python3_sitelib}/zeitgeist/
-
 %files libs
 %license COPYING
 %{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib
@@ -191,7 +135,6 @@ dbus-run-session -- ./test-script
 %{_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
@@ -199,119 +142,10 @@ dbus-run-session -- ./test-script
 %{_datadir}/vala/vapi/zeitgeist-2.0.vapi
 %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
 
+%files -n python2-%{name}
+%{python2_sitelib}/zeitgeist/
+
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1.0.4-24
-- Rebuilt for Python 3.15
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.0.4-22
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.0.4-21
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jun 12 2025 Python Maint <python-maint@redhat.com> - 1.0.4-19
-- Rebuilt for Python 3.14
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Aug 16 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-17
-- execute test program which require dbus and zeitgeist-daemon
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sun Jun 16 2024 Python Maint <python-maint@redhat.com> - 1.0.4-15
-- Rebuilt for Python 3.13
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-13
-- Regenerate C source from Vala source and enable
-  -Werror=incompatible-pointer-types again
-  (Thanks to Florian Weimer <fweimer@redhat.com>)
-
-* Thu Jan 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-12
-- Change -Wincompatible-pointer-types from error to warning
-
-* Sun Dec 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-11
-- SPDX migration
-
-* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.0.4-9
-- Rebuilt for Python 3.12
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-7
-- F-37+: Replace inspect.getargspec removed on python3.11 (bug 2159916)
-
-* Sat Sep 10 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <mtasaka@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.4-3
-- Rebuilt for Python 3.11
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jan 12 2022 Fabio Valentini <decathorpe@gmail.com> - 1.0.4-1
-- Update to version 1.0.4.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.3-5
-- Rebuilt for Python 3.10
-
-* Tue Apr 20 2021 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-4
-- Include upstream patches for vala 0.52 support.
-
-* Sun Mar 14 2021 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-3
-- Reintroduce Python bindings, they support Python 3 since version 1.0.3.
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 15 2020 David King <amigadave@amigadave.com> - 1.0.3-1
-- Update to 1.0.3 (#1888547)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Sep 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.2-1
-- Update to version 1.0.2.
-- Drop unused python bindings.
-- Drop unnecessary patches.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild