Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tracker-miners.git#d4cacb582d333f1dd27967359d67cbc2db7c8eaa
This commit is contained in:
DistroBaker
parent
327f4370c2
commit
b939e3c07f
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,3 +19,4 @@
|
||||
/tracker-miners-2.3.3.tar.xz
|
||||
/tracker-miners-2.3.4.tar.xz
|
||||
/tracker-miners-2.3.5.tar.xz
|
||||
/tracker-miners-3.1.0.rc.tar.xz
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From b3fdbaf1ab23ce7191ace6db79575dfce5f90881 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Sun, 25 Oct 2020 15:37:13 +0100
|
||||
Subject: [PATCH] libtracker-miners-common: Add newstatat/statat64 syscalls
|
||||
|
||||
These are done in recent glib versions, should be observed here.
|
||||
---
|
||||
src/libtracker-miners-common/tracker-seccomp.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c
|
||||
index c0327eb08..01887e829 100644
|
||||
--- a/src/libtracker-miners-common/tracker-seccomp.c
|
||||
+++ b/src/libtracker-miners-common/tracker-seccomp.c
|
||||
@@ -91,6 +91,8 @@ tracker_seccomp_init (void)
|
||||
/* Basic filesystem access */
|
||||
ALLOW_RULE (fstat);
|
||||
ALLOW_RULE (fstat64);
|
||||
+ ALLOW_RULE (fstatat64);
|
||||
+ ALLOW_RULE (newfstatat);
|
||||
ALLOW_RULE (stat);
|
||||
ALLOW_RULE (stat64);
|
||||
ALLOW_RULE (statfs);
|
||||
--
|
||||
2.29.2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (tracker-miners-2.3.5.tar.xz) = 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
|
||||
SHA512 (tracker-miners-3.1.0.rc.tar.xz) = 0cffde2ba7a49ffe5c8d4f1fe898c28e517d0c80666d2f7a1c06cbf863cee70c34053f86e99741d3bc045f639af2d0662ee00ca7aa2368e906cc203786e22ed5
|
||||
|
||||
@ -8,29 +8,29 @@
|
||||
%global with_rss 1
|
||||
%endif
|
||||
|
||||
%global tracker_version 2.2.0
|
||||
%global tracker_version 3.1
|
||||
|
||||
%global systemd_units tracker-extract.service tracker-miner-fs.service tracker-miner-rss.service tracker-writeback.service
|
||||
%global systemd_units tracker-extract-3.service tracker-miner-fs-3.service tracker-miner-fs-control-3.service tracker-miner-rss-3.service tracker-writeback-3.service
|
||||
|
||||
# Exclude private libraries from autogenerated provides and requires
|
||||
%global __provides_exclude_from ^%{_libdir}/tracker-miners-2.0/
|
||||
%global __requires_exclude ^(libtracker-extract\.so|libtracker-miners-common\.so|libextract-.*\.so|libwriteback-.*\.so)
|
||||
%global __provides_exclude_from ^%{_libdir}/tracker-miners-3.0/
|
||||
%global __requires_exclude ^(libtracker-extract\.so|libtracker-miner-3\.0\.so|libextract-.*\.so|libwriteback-.*\.so)
|
||||
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: tracker-miners
|
||||
Version: 2.3.5
|
||||
Version: 3.1.0~rc
|
||||
Release: 3%{?dist}
|
||||
Summary: Tracker miners and metadata extractors
|
||||
|
||||
# libtracker-extract is LGPLv2+; the miners are a mix of GPLv2+ and LGPLv2+ code
|
||||
# libtracker-extract and libtracker-miner libraries are LGPLv2+; the miners are a mix of GPLv2+ and LGPLv2+ code
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://wiki.gnome.org/Projects/Tracker
|
||||
Source0: https://download.gnome.org/sources/%{name}/2.3/%{name}-%{version}.tar.xz
|
||||
# Allow newfstatat and fstatat64 calls in seccomp sandbox (RHBZ #1892452)
|
||||
Patch0: 0001-libtracker-miners-common-Add-newstatat-statat64-sysc.patch
|
||||
URL: https://gnome.pages.gitlab.gnome.org/tracker/
|
||||
Source0: https://download.gnome.org/sources/tracker-miners/3.1/tracker-miners-%{tarball_version}.tar.xz
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: gcc
|
||||
BuildRequires: giflib-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: meson
|
||||
BuildRequires: systemd
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
@ -56,26 +56,27 @@ BuildRequires: pkgconfig(libgsf-1)
|
||||
BuildRequires: pkgconfig(libgxps)
|
||||
BuildRequires: pkgconfig(libiptcdata)
|
||||
BuildRequires: pkgconfig(libjpeg)
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: pkgconfig(libosinfo-1.0)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
BuildRequires: pkgconfig(libtiff-4)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(poppler-glib)
|
||||
BuildRequires: pkgconfig(taglib_c)
|
||||
BuildRequires: pkgconfig(totem-plparser)
|
||||
BuildRequires: pkgconfig(tracker-sparql-2.0) >= %{tracker_version}
|
||||
BuildRequires: pkgconfig(tracker-sparql-3.0) >= %{tracker_version}
|
||||
BuildRequires: pkgconfig(upower-glib)
|
||||
BuildRequires: pkgconfig(vorbisfile)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
# renamed in F34
|
||||
Obsoletes: tracker3-miners < 3.1.0~rc-2
|
||||
Conflicts: tracker3-miners < 3.1.0~rc-2
|
||||
Provides: tracker3-miners = %{version}-%{release}
|
||||
Provides: tracker3-miners%{?_isa} = %{version}-%{release}
|
||||
|
||||
%{?systemd_requires}
|
||||
Requires: tracker%{?_isa} >= %{tracker_version}
|
||||
|
||||
# tracker-miners was split out from tracker in 1.99.2
|
||||
Obsoletes: tracker < 1.99.2
|
||||
Conflicts: tracker < 1.99.2
|
||||
|
||||
%description
|
||||
Tracker is a powerful desktop-neutral first class object database,
|
||||
tag/metadata database and search tool.
|
||||
@ -84,29 +85,28 @@ This package contains various miners and metadata extractors for tracker.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n tracker-miners-%{tarball_version}
|
||||
|
||||
|
||||
%build
|
||||
# Disable the functional tests for now, they use python bytecodes.
|
||||
%meson \
|
||||
-Dfunctional_tests=false \
|
||||
-Dtracker_core=system \
|
||||
%if ! 0%{?with_libcue}
|
||||
-Dcue=disabled \
|
||||
%endif
|
||||
%if ! 0%{?with_rss}
|
||||
-Dminer_rss=false \
|
||||
%endif
|
||||
-Dsystemd_user_services=%{_userunitdir}
|
||||
-Dsystemd_user_services_dir=%{_userunitdir} \
|
||||
%{nil}
|
||||
|
||||
%meson_build
|
||||
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
rm -rf %{buildroot}%{_datadir}/tracker-tests
|
||||
|
||||
%find_lang %{name}
|
||||
%find_lang tracker3-miners
|
||||
|
||||
|
||||
%post
|
||||
@ -119,20 +119,32 @@ rm -rf %{buildroot}%{_datadir}/tracker-tests
|
||||
%systemd_user_postun_with_restart %{systemd_units}
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%files -f tracker3-miners.lang
|
||||
%license COPYING*
|
||||
%doc AUTHORS NEWS README.md
|
||||
%{_libdir}/tracker-miners-2.0/
|
||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/tracker-miner-fs-3.desktop
|
||||
%if 0%{?with_rss}
|
||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/tracker-miner-rss-3.desktop
|
||||
%endif
|
||||
%{_libdir}/tracker-miners-3.0/
|
||||
%{_libexecdir}/tracker*
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Tracker3.Miner.Files.Index.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Tracker3.Miner.xml
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.Tracker*
|
||||
%{_datadir}/glib-2.0/schemas/*
|
||||
%{_datadir}/tracker/
|
||||
%{_datadir}/tracker-miners/
|
||||
%{_mandir}/man1/tracker-*.1*
|
||||
%{_datadir}/tracker3-miners/
|
||||
%{_mandir}/man1/tracker*.1*
|
||||
%{_userunitdir}/tracker*.service
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 3.1.0~rc-3
|
||||
- Add conflicts with tracker3-miners to help with the upgrade path
|
||||
|
||||
* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 3.1.0~rc-2
|
||||
- Update to 3.1.0.rc, based on earlier tracker3-miners packaging
|
||||
- Obsolete separate tracker3-miners package
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user