Compare commits
34 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b163f7eac | ||
|
|
6948211b62 | ||
|
|
e8d46230f6 | ||
|
|
7fb25e01c1 | ||
|
|
79c5149403 | ||
|
|
323a8fe2ed | ||
|
|
6a79f97631 | ||
|
|
76bcac0773 | ||
| bd7757ef4d | |||
|
|
ade8afe126 | ||
|
|
79abd0f865 | ||
|
|
0e75261c66 | ||
| 14a064c48a | |||
| bdb79a7fae | |||
| 14a5e182aa | |||
| 48df067a87 | |||
|
|
89bace310a | ||
|
|
a7c9b74297 | ||
| 93de2acd7b | |||
| cbeb23e65b | |||
| b16e1bb005 | |||
| e3e9b52a96 | |||
|
|
09518194d5 | ||
|
|
4965e18560 | ||
|
|
c3c3c3af23 | ||
|
|
de03a8e2df |
||
|
|
329bc1e86c | ||
|
|
bb2c1b4f0f | ||
|
|
ab1feba1fb |
||
|
|
8b49887b17 |
||
|
|
4ab4e9e172 | ||
|
|
2a77a7a993 | ||
|
|
594940b69b | ||
|
|
d92fbfcba7 |
5 changed files with 235 additions and 377 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -14,3 +14,5 @@ zeitgeist-0.5.0.tar.gz
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -1,353 +0,0 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9664cde..b145e62 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -7,7 +7,6 @@ SUBDIRS = \
|
||||
src \
|
||||
extensions \
|
||||
data \
|
||||
- python \
|
||||
test \
|
||||
examples \
|
||||
po \
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 395df47..f68dac0 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
-DIST_SUBDIRS = libzeitgeist src extensions data python test examples \
|
||||
+DIST_SUBDIRS = libzeitgeist src extensions data test examples \
|
||||
po doc datahub
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/build-aux/compile \
|
||||
@@ -343,11 +343,6 @@ PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
POSUB = @POSUB@
|
||||
-PYTHON = @PYTHON@
|
||||
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||
-PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||
-PYTHON_VERSION = @PYTHON_VERSION@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@@ -411,12 +406,10 @@ mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
pkgpyexecdir = @pkgpyexecdir@
|
||||
-pkgpythondir = @pkgpythondir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
pyexecdir = @pyexecdir@
|
||||
-pythondir = @pythondir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
@@ -428,7 +421,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
NULL =
|
||||
ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
|
||||
-SUBDIRS = libzeitgeist src extensions data python test examples po doc \
|
||||
+SUBDIRS = libzeitgeist src extensions data test examples po doc \
|
||||
$(NULL) $(am__append_1)
|
||||
zeitgeistdocdir = $(pkgdatadir)/doc
|
||||
zeitgeistdoc_DATA = \
|
||||
diff --git a/configure b/configure
|
||||
index dd39c48..86708cd 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -812,15 +812,6 @@ CPPFLAGS
|
||||
LDFLAGS
|
||||
CFLAGS
|
||||
CC
|
||||
-pkgpyexecdir
|
||||
-pyexecdir
|
||||
-pkgpythondir
|
||||
-pythondir
|
||||
-PYTHON_PLATFORM
|
||||
-PYTHON_EXEC_PREFIX
|
||||
-PYTHON_PREFIX
|
||||
-PYTHON_VERSION
|
||||
-PYTHON
|
||||
MAINT
|
||||
MAINTAINER_MODE_FALSE
|
||||
MAINTAINER_MODE_TRUE
|
||||
@@ -921,7 +912,6 @@ enable_introspection
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
target_alias
|
||||
-PYTHON
|
||||
CC
|
||||
CFLAGS
|
||||
LDFLAGS
|
||||
@@ -1619,7 +1609,6 @@ Optional Packages:
|
||||
Build the FTS extension with dee-icu
|
||||
|
||||
Some influential environment variables:
|
||||
- PYTHON the Python interpreter
|
||||
CC C compiler command
|
||||
CFLAGS C compiler flags
|
||||
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
||||
@@ -3224,215 +3213,6 @@ fi
|
||||
MAINT=$MAINTAINER_MODE_TRUE
|
||||
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
- # Find any Python interpreter.
|
||||
- if test -z "$PYTHON"; then
|
||||
- for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
|
||||
-do
|
||||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
-set dummy $ac_prog; ac_word=$2
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
-$as_echo_n "checking for $ac_word... " >&6; }
|
||||
-if ${ac_cv_path_PYTHON+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- case $PYTHON in
|
||||
- [\\/]* | ?:[\\/]*)
|
||||
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
|
||||
- ;;
|
||||
- *)
|
||||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
-for as_dir in $PATH
|
||||
-do
|
||||
- IFS=$as_save_IFS
|
||||
- test -z "$as_dir" && as_dir=.
|
||||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
||||
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
- break 2
|
||||
- fi
|
||||
-done
|
||||
- done
|
||||
-IFS=$as_save_IFS
|
||||
-
|
||||
- ;;
|
||||
-esac
|
||||
-fi
|
||||
-PYTHON=$ac_cv_path_PYTHON
|
||||
-if test -n "$PYTHON"; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
|
||||
-$as_echo "$PYTHON" >&6; }
|
||||
-else
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
-$as_echo "no" >&6; }
|
||||
-fi
|
||||
-
|
||||
-
|
||||
- test -n "$PYTHON" && break
|
||||
-done
|
||||
-test -n "$PYTHON" || PYTHON=":"
|
||||
-
|
||||
- fi
|
||||
- am_display_PYTHON=python
|
||||
-
|
||||
-
|
||||
- if test "$PYTHON" = :; then
|
||||
- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
|
||||
- else
|
||||
-
|
||||
-
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
|
||||
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
|
||||
-if ${am_cv_python_version+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
-$as_echo "$am_cv_python_version" >&6; }
|
||||
- PYTHON_VERSION=$am_cv_python_version
|
||||
-
|
||||
-
|
||||
-
|
||||
- PYTHON_PREFIX='${prefix}'
|
||||
-
|
||||
- PYTHON_EXEC_PREFIX='${exec_prefix}'
|
||||
-
|
||||
-
|
||||
-
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
|
||||
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
|
||||
-if ${am_cv_python_platform+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
|
||||
-$as_echo "$am_cv_python_platform" >&6; }
|
||||
- PYTHON_PLATFORM=$am_cv_python_platform
|
||||
-
|
||||
-
|
||||
- # Just factor out some code duplication.
|
||||
- am_python_setup_sysconfig="\
|
||||
-import sys
|
||||
-# Prefer sysconfig over distutils.sysconfig, for better compatibility
|
||||
-# with python 3.x. See automake bug#10227.
|
||||
-try:
|
||||
- import sysconfig
|
||||
-except ImportError:
|
||||
- can_use_sysconfig = 0
|
||||
-else:
|
||||
- can_use_sysconfig = 1
|
||||
-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
|
||||
-# <https://github.com/pypa/virtualenv/issues/118>
|
||||
-try:
|
||||
- from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
- can_use_sysconfig = 0
|
||||
-except ImportError:
|
||||
- pass"
|
||||
-
|
||||
-
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
|
||||
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
|
||||
-if ${am_cv_python_pythondir+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- if test "x$prefix" = xNONE
|
||||
- then
|
||||
- am_py_prefix=$ac_default_prefix
|
||||
- else
|
||||
- am_py_prefix=$prefix
|
||||
- fi
|
||||
- am_cv_python_pythondir=`$PYTHON -c "
|
||||
-$am_python_setup_sysconfig
|
||||
-if can_use_sysconfig:
|
||||
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
|
||||
-else:
|
||||
- from distutils import sysconfig
|
||||
- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
|
||||
-sys.stdout.write(sitedir)"`
|
||||
- case $am_cv_python_pythondir in
|
||||
- $am_py_prefix*)
|
||||
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
||||
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
|
||||
- ;;
|
||||
- *)
|
||||
- case $am_py_prefix in
|
||||
- /usr|/System*) ;;
|
||||
- *)
|
||||
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
|
||||
-$as_echo "$am_cv_python_pythondir" >&6; }
|
||||
- pythondir=$am_cv_python_pythondir
|
||||
-
|
||||
-
|
||||
-
|
||||
- pkgpythondir=\${pythondir}/$PACKAGE
|
||||
-
|
||||
-
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
|
||||
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
|
||||
-if ${am_cv_python_pyexecdir+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- if test "x$exec_prefix" = xNONE
|
||||
- then
|
||||
- am_py_exec_prefix=$am_py_prefix
|
||||
- else
|
||||
- am_py_exec_prefix=$exec_prefix
|
||||
- fi
|
||||
- am_cv_python_pyexecdir=`$PYTHON -c "
|
||||
-$am_python_setup_sysconfig
|
||||
-if can_use_sysconfig:
|
||||
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
|
||||
-else:
|
||||
- from distutils import sysconfig
|
||||
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
|
||||
-sys.stdout.write(sitedir)"`
|
||||
- case $am_cv_python_pyexecdir in
|
||||
- $am_py_exec_prefix*)
|
||||
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
||||
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
|
||||
- ;;
|
||||
- *)
|
||||
- case $am_py_exec_prefix in
|
||||
- /usr|/System*) ;;
|
||||
- *)
|
||||
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
|
||||
-$as_echo "$am_cv_python_pyexecdir" >&6; }
|
||||
- pyexecdir=$am_cv_python_pyexecdir
|
||||
-
|
||||
-
|
||||
-
|
||||
- pkgpyexecdir=\${pyexecdir}/$PACKAGE
|
||||
-
|
||||
-
|
||||
-
|
||||
- fi
|
||||
-
|
||||
-
|
||||
-
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@@ -18776,7 +18556,7 @@ $as_echo "yes" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
-ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile python/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in"
|
||||
+ac_config_files="$ac_config_files Makefile src/Makefile libzeitgeist/Makefile libzeitgeist/zeitgeist-2.0.pc datahub/Makefile extensions/Makefile extensions/fts++/Makefile extensions/fts++/test/Makefile data/Makefile data/ontology/Makefile test/Makefile test/dbus/Makefile test/direct/Makefile test/c/Makefile test/data/Makefile examples/Makefile examples/c/Makefile examples/vala/Makefile doc/Makefile doc/libzeitgeist/Makefile po/Makefile.in"
|
||||
|
||||
|
||||
#################################################
|
||||
@@ -19531,24 +19311,6 @@ fi
|
||||
|
||||
|
||||
|
||||
-fi
|
||||
-
|
||||
-#################################################
|
||||
-# Ontology parsing dependencies
|
||||
-#################################################
|
||||
-
|
||||
-# check for python-rdflib
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5
|
||||
-$as_echo_n "checking for python-rdflib... " >&6; }
|
||||
-echo "import rdflib" | $PYTHON - 2>/dev/null
|
||||
-if test $? -ne 0 ; then
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
-as_fn_error $? "failed. Please install the python-rdflib package.
|
||||
-See \`config.log' for more details" "$LINENO" 5; }
|
||||
-else
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
-$as_echo "yes" >&6; }
|
||||
fi
|
||||
|
||||
#################################################
|
||||
@@ -20727,7 +20489,6 @@ do
|
||||
"extensions/fts++/test/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/fts++/test/Makefile" ;;
|
||||
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
|
||||
"data/ontology/Makefile") CONFIG_FILES="$CONFIG_FILES data/ontology/Makefile" ;;
|
||||
- "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
|
||||
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
|
||||
"test/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES test/dbus/Makefile" ;;
|
||||
"test/direct/Makefile") CONFIG_FILES="$CONFIG_FILES test/direct/Makefile" ;;
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zeitgeist-1.0.2.tar.xz) = 5feb96cd52bbc2fc0fb69759dc10d39358385e853c03324eb2e58b0ac44383362be6554bc7df4561f5636ab9ce7b6883b76385c98ddcb43e48e89fa809e85855
|
||||
SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
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
|
||||
|
||||
216
zeitgeist.spec
216
zeitgeist.spec
|
|
@ -1,24 +1,40 @@
|
|||
Name: zeitgeist
|
||||
Version: 1.0.2
|
||||
Release: 2%{?dist}
|
||||
Version: 1.0.4
|
||||
Release: 25%{?dist}
|
||||
Summary: Framework providing Desktop activity awareness
|
||||
# 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+
|
||||
|
||||
# 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
|
||||
|
||||
# patch build system to disable building custom python2 bindings
|
||||
Patch0: 00-disable-python.patch
|
||||
# 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
|
||||
|
|
@ -31,9 +47,12 @@ 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
|
||||
|
||||
|
|
@ -44,9 +63,21 @@ 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: LGPLv2+
|
||||
License: LGPL-2.0-or-later
|
||||
|
||||
%description libs
|
||||
Libzeitgeist is a client library for interacting with the Zeitgeist
|
||||
|
|
@ -54,7 +85,7 @@ daemon.
|
|||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
License: LGPLv2+
|
||||
License: LGPL-2.0-or-later
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -64,14 +95,27 @@ developing applications that use %{name}.
|
|||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
# make sure to nuke python stuff
|
||||
rm -r python
|
||||
# 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
|
||||
%make_build
|
||||
|
|
@ -85,7 +129,20 @@ find %{buildroot} -name '*.la' -delete -print
|
|||
rm -frv %{buildroot}%{_datadir}/zeitgeist/doc
|
||||
|
||||
%check
|
||||
make check || true
|
||||
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
|
||||
|
||||
%post
|
||||
%systemd_user_post %{name}.service
|
||||
|
|
@ -99,21 +156,32 @@ make check || true
|
|||
|
||||
|
||||
%files
|
||||
%doc AUTHORS NEWS
|
||||
%license COPYING COPYING.GPL
|
||||
%doc AUTHORS
|
||||
%doc NEWS
|
||||
%license COPYING
|
||||
%license COPYING.GPL
|
||||
|
||||
%{_bindir}/zeitgeist-daemon
|
||||
%{_bindir}/zeitgeist-datahub
|
||||
%{_libexecdir}/%{name}/
|
||||
%{_datadir}/%{name}/
|
||||
%dir %{_libexecdir}/%{name}/
|
||||
%{_libexecdir}/%{name}/zeitgeist-fts
|
||||
|
||||
%dir %{_datadir}/%{name}/
|
||||
%dir %{_datadir}/%{name}/ontology/
|
||||
%{_datadir}/%{name}/ontology/*.trig
|
||||
%{_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
|
||||
|
|
@ -123,6 +191,7 @@ make check || true
|
|||
%{_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
|
||||
|
|
@ -131,6 +200,107 @@ make check || true
|
|||
%{_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)
|
||||
|
||||
* 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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue