Compare commits

..

No commits in common. "rawhide" and "f28" have entirely different histories.

5 changed files with 72 additions and 274 deletions

4
.gitignore vendored
View file

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

View file

@ -1 +1 @@
SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b
SHA512 (zeitgeist-1.0.tar.xz) = e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8

View file

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

View file

@ -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

View file

@ -1,43 +1,19 @@
Name: zeitgeist
Version: 1.0.4
Release: 25%{?dist}
Version: 1.0
Release: 6%{?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
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-rdflib
BuildRequires: systemd
BuildRequires: vala
BuildRequires: xapian-core-devel
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)
@ -46,15 +22,20 @@ 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: python-rdflib
BuildRequires: raptor2
%{?systemd_requires}
BuildRequires: systemd
BuildRequires: vala
BuildRequires: xapian-core-devel
# For patch0.
BuildRequires: autoconf automake /usr/bin/autopoint libtool
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 +44,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,38 +54,37 @@ 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: dbus-python
Requires: 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 {} \;
%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
# 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
# For patch0.
autoreconf --force --install
%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
@ -152,36 +107,27 @@ dbus-run-session -- ./test-script
%systemd_user_preun %{name}.service
%systemd_user_preun %{name}-fts.service
%ldconfig_scriptlets libs
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%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 +137,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,133 +144,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
* Tue Jan 29 2019 David King <amigadave@amigadave.com> - 1.0.1-1
- Update to 1.0.1
- Fix VAPI file for recent Vala (#1668410)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Feb 10 2018 Iryna Shcherbina <ishcherb@redhat.com> - 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 <releng@fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild