1 changed files with 14 additions and 115 deletions
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@ -1,28 +1,15 @@
 Name:           zeitgeist
 Version:        1.0.4
-Release:        25%{?dist}
+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
@ -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,16 @@ 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
-sed -i.py311 python/client.py \
-	-e 's|inspect.getargspec|inspect.getfullargspec|'

 %build
 %configure --enable-fts --enable-datahub --disable-silent-rules
@ -129,20 +103,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

 %post
 %systemd_user_post %{name}.service
@ -163,12 +124,9 @@ dbus-run-session -- ./test-script

 %{_bindir}/zeitgeist-daemon
 %{_bindir}/zeitgeist-datahub
-%dir	%{_libexecdir}/%{name}/
-%{_libexecdir}/%{name}/zeitgeist-fts
+%{_libexecdir}/%{name}/

-%dir	%{_datadir}/%{name}/
-%dir	%{_datadir}/%{name}/ontology/
-%{_datadir}/%{name}/ontology/*.trig
+%{_datadir}/%{name}/
 %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
@ -200,65 +158,6 @@ dbus-run-session -- ./test-script
 %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi

 %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)