diff --git a/zeitgeist.spec b/zeitgeist.spec index 66d1d50..5dc3cb3 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,28 +1,15 @@ Name: zeitgeist Version: 1.0.4 -Release: 25%{?dist} +Release: 8%{?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 @@ -47,8 +34,6 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(telepathy-glib) -BuildRequires: /usr/bin/dbus-run-session - %{?systemd_requires} Requires: dbus @@ -65,7 +50,6 @@ 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 @@ -77,7 +61,7 @@ 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,7 +69,7 @@ daemon. %package devel Summary: Development files for %{name} -License: LGPL-2.0-or-later +License: LGPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -95,26 +79,24 @@ 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 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 +%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 @@ -129,20 +111,7 @@ find %{buildroot} -name '*.la' -delete -print 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