diff --git a/.gitignore b/.gitignore index 56ab76b..bbac0dc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,3 @@ 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 -/zeitgeist-0.9.0.tar.bz2 -/zeitgeist-0.9.5.tar.bz2 -/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 -/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 diff --git a/sources b/sources index cf017f3..20f427b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b +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-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 deleted file mode 100644 index 711c6a9..0000000 --- a/zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 66d1d50..ca6605a 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,423 +1,64 @@ -Name: zeitgeist -Version: 1.0.4 -Release: 25%{?dist} -Summary: Framework providing Desktop activity awareness +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -# 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 -# 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 - -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: /usr/bin/dbus-run-session - -%{?systemd_requires} - -Requires: dbus -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: zeitgeist-datahub < 0.9.5-4 -Obsoletes: python2-%{name} < 1.0.2-1 +Summary: Framework providing Desktop activity awareness +Name: zeitgeist +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.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 %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 -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 - -%description libs -Libzeitgeist is a client library for interacting with the Zeitgeist -daemon. - -%package devel -Summary: Development files for %{name} -License: LGPL-2.0-or-later -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - - %prep -%autosetup -p1 -# Regenerate C source from vala source -find -name '*.vala' -exec touch {} \; +%setup -q +%patch -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 -%configure --enable-fts --enable-datahub --disable-silent-rules -%make_build +%configure +make %{?_smp_mflags} %install -%make_install - -find %{buildroot} -name '*.la' -delete -print - -# We install AUTHORS and NEWS with %%doc instead -rm -frv %{buildroot}%{_datadir}/zeitgeist/doc - -%check -cat > test-script < - 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 - -* 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 - -* 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 - -* 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 - -* Fri Aug 16 2024 Mamoru TASAKA - 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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. - -* 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 - -* 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 - -* 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. -- Drop unnecessary patches. - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 -- 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 - -* 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 - * 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 - * Sat Oct 22 2011 Deji Akingunola - 0.8.2-2 - Revert post-install script to restart zeitgeist daemon on update