.gitignore

@@ -1 +1 @@
-SOURCES/tracker-miners-3.1.2.tar.xz
+SOURCES/tracker-miners-3.7.3.tar.xz

.tracker-miners.metadata

@@ -1 +1 @@
-3e90fa813fe5e7682238bdfc83eae517f83b0e3f SOURCES/tracker-miners-3.1.2.tar.xz
+03bd6a29e1963d30a5d8706ad61cd530d4b04d8e SOURCES/tracker-miners-3.7.3.tar.xz

SOURCES/0001-libtracker-common-Backport-seccomp-additions-from-3..patch

@@ -1,74 +0,0 @@
-From 18becd68b4f5b6ebb4024dcfaac1231647778f4b Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Tue, 1 Nov 2022 17:10:42 +0100
-Subject: [PATCH] libtracker-common: Backport seccomp additions from 3.4.x
-
----
- src/libtracker-miners-common/tracker-seccomp.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c
-index f8be94924..6b1c35450 100644
---- a/src/libtracker-miners-common/tracker-seccomp.c
-+++ b/src/libtracker-miners-common/tracker-seccomp.c
-@@ -102,12 +102,15 @@ tracker_seccomp_init (void)
- 
- 	/* Memory management */
- 	ALLOW_RULE (brk);
-+	ALLOW_RULE (get_mempolicy);
-+	ALLOW_RULE (set_mempolicy);
- 	ALLOW_RULE (mmap);
- 	ALLOW_RULE (mmap2);
- 	ALLOW_RULE (munmap);
- 	ALLOW_RULE (mremap);
- 	ALLOW_RULE (mprotect);
- 	ALLOW_RULE (madvise);
-+	ALLOW_RULE (mbind);
- 	ERROR_RULE (mlock, EPERM);
- 	ERROR_RULE (mlock2, EPERM);
- 	ERROR_RULE (munlock, EPERM);
-@@ -116,6 +119,7 @@ tracker_seccomp_init (void)
- 	/* Process management */
- 	ALLOW_RULE (exit_group);
- 	ALLOW_RULE (getuid);
-+	ALLOW_RULE (getgid);
- 	ALLOW_RULE (getuid32);
- 	ALLOW_RULE (getegid);
- 	ALLOW_RULE (getegid32);
-@@ -140,19 +144,25 @@ tracker_seccomp_init (void)
- 	ALLOW_RULE (lstat64);
- 	ALLOW_RULE (statx);
- 	ALLOW_RULE (access);
-+	ALLOW_RULE (faccessat);
-+	ALLOW_RULE (faccessat2);
- 	ALLOW_RULE (getdents);
- 	ALLOW_RULE (getdents64);
-+	ALLOW_RULE (getcwd);
- 	ALLOW_RULE (readlink);
- 	ALLOW_RULE (readlinkat);
- 	ALLOW_RULE (utime);
- 	ALLOW_RULE (time);
- 	ALLOW_RULE (fsync);
- 	ALLOW_RULE (umask);
-+	ERROR_RULE (fchown, EPERM);
- 	/* Processes and threads */
- 	ALLOW_RULE (clone);
-+	ALLOW_RULE (clone3);
- 	ALLOW_RULE (futex);
- 	ALLOW_RULE (futex_time64);
- 	ALLOW_RULE (set_robust_list);
-+	ALLOW_RULE (rseq);
- 	ALLOW_RULE (rt_sigaction);
- 	ALLOW_RULE (rt_sigprocmask);
- 	ALLOW_RULE (sched_yield);
-@@ -175,6 +185,7 @@ tracker_seccomp_init (void)
- 	ALLOW_RULE (pipe);
- 	ALLOW_RULE (pipe2);
- 	ALLOW_RULE (epoll_create);
-+	ALLOW_RULE (epoll_create1);
- 	ALLOW_RULE (epoll_ctl);
- 	/* System */
- 	ALLOW_RULE (uname);
--- 
-2.38.1
-

SOURCES/flatpak-fixup.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+set -eu
+
+app=$1
+
+for srv in Files Files.Control; do
+    sed -e "s|org.gnome.FlatpakApp|${app}|" -i /app/share/dbus-1/services/org.gnome.FlatpakApp.Tracker3.Miner.$srv.service ;
+    mv /app/share/dbus-1/services/{org.gnome.FlatpakApp,${app}}.Tracker3.Miner.$srv.service ;
+done
+
+sed -e "s|org.gnome.FlatpakApp|${app}|" -i /app/share/tracker3/domain-ontologies/org.gnome.FlatpakApp.domain.rule
+mv /app/share/tracker3/domain-ontologies/{org.gnome.FlatpakApp,${app}}.domain.rule

SPECS/tracker-miners.spec

@@ -1,14 +1,27 @@
-%if 0%{?rhel}
+# This needs to be changed accordingly to the application for what tracker-miners is bundled,
+# e.g. for gnome-books, it would be org.gnome.Books. For F39+ flatpaks, this is done
+# in container.yaml cleanup-commands.
+%if 0%{?flatpak}
+%global domain_ontology org.gnome.FlatpakApp
+%else
+%global domain_ontology org.freedesktop
+%endif
+
+%if 0%{?rhel} || 0%{?flatpak}
 %global with_enca 0
 %global with_libcue 0
 %global with_rss 0
+%if 0%{?rhel} >= 10
+%global with_totem-pl-parser 0
+%endif
 %else
 %global with_enca 1
 %global with_libcue 1
 %global with_rss 1
+%global with_totem-pl-parser 1
 %endif
 
-%global tracker_version 3.1.0
+%global tracker_version 3.7
 
 %if 0%{?with_rss}
 %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
@@ -23,23 +36,21 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           tracker-miners
-Version:        3.1.2
+Version:        3.7.3
-Release:        4%{?dist}
+Release:        3%{?dist}
 Summary:        Tracker miners and metadata extractors
 
 # libtracker-extract and libtracker-miner libraries are LGPLv2+; the miners are a mix of GPLv2+ and LGPLv2+ code
-License:        GPLv2+ and LGPLv2+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://gnome.pages.gitlab.gnome.org/tracker/
-Source0:        https://download.gnome.org/sources/tracker-miners/3.1/tracker-miners-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.7/%{name}-%{tarball_version}.tar.xz
-
+Source1:        flatpak-fixup.sh
-Patch1: 0001-libtracker-common-Backport-seccomp-additions-from-3..patch
-Patch2: stricter-seccomp.diff
 
 BuildRequires:  asciidoc
 BuildRequires:  gcc
 BuildRequires:  giflib-devel
 BuildRequires:  meson
-BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(dbus-1)
 %if 0%{?with_enca}
 BuildRequires:  pkgconfig(enca)
@@ -63,17 +74,21 @@ 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)
+%if 0%{?with_totem-pl-parser}
 BuildRequires:  pkgconfig(totem-plparser)
+%endif
 BuildRequires:  pkgconfig(tracker-sparql-3.0) >= %{tracker_version}
-BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(vorbisfile)
+%if !0%{?flatpak}
+BuildRequires:  pkgconfig(libosinfo-1.0)
+BuildRequires:  pkgconfig(libnm)
+BuildRequires:  pkgconfig(upower-glib)
+%endif
 
 # renamed in F34
 Obsoletes:      tracker3-miners < 3.1.0~rc-2
@@ -81,8 +96,9 @@ Conflicts:      tracker3-miners < 3.1.0~rc-2
 Provides:       tracker3-miners = %{version}-%{release}
 Provides:       tracker3-miners%{?_isa} = %{version}-%{release}
 
-%{?systemd_requires}
+%if !0%{?flatpak}
 Requires:       tracker%{?_isa} >= %{tracker_version}
+%endif
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -92,19 +108,32 @@ This package contains various miners and metadata extractors for tracker.
 
 
 %prep
-%autosetup -p1 -n tracker-miners-%{tarball_version}
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 
 %build
 %meson \
   -Dtracker_core=system \
+%if 0%{?flatpak}
+  -Dwriteback=false \
+  -Dsystemd_user_services=false \
+  -Diso=disabled \
+  -Dnetwork_manager=disabled \
+  -Dbattery_detection=none \
+  -Ddomain_prefix=%{domain_ontology} \
+%endif
 %if ! 0%{?with_libcue}
   -Dcue=disabled \
 %endif
 %if ! 0%{?with_rss}
   -Dminer_rss=false \
 %endif
+%if ! 0%{?flatpak}
   -Dsystemd_user_services_dir=%{_userunitdir} \
+%endif
+%if ! 0%{?with_totem-pl-parser}
+  -Dplaylist=disabled \
+%endif
   %{nil}
 
 %meson_build
@@ -113,6 +142,10 @@ This package contains various miners and metadata extractors for tracker.
 %install
 %meson_install
 
+%if 0%{?flatpak}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}-flatpak-fixup.sh
+%endif
+
 %find_lang tracker3-miners
 
 
@@ -133,39 +166,185 @@ This package contains various miners and metadata extractors for tracker.
 %if 0%{?with_rss}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/tracker-miner-rss-3.desktop
 %endif
+%{_bindir}/tracker3-*
 %{_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}/dbus-1/services/%{domain_ontology}.Tracker*
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/tracker3-miners/
+%dir %{_datadir}/tracker3
+%dir %{_datadir}/tracker3/commands
+%{_datadir}/tracker3/commands/tracker-*.desktop
 %{_mandir}/man1/tracker*.1*
+%if !0%{?flatpak}
 %{_userunitdir}/tracker*.service
+%endif
+%if 0%{?flatpak}
+%{_datadir}/tracker3/domain-ontologies/%{domain_ontology}.domain.rule
+%{_bindir}/%{name}-flatpak-fixup.sh
+%endif
 
 
 %changelog
-* Thu Nov 30 2023 Carlos Garnacho <cgarnach@redhat.com> - 3.1.2-4
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.7.3-3
-- Backport stricter seccomp jail
+- Rebuilt for MSVSphere 10
-  Resolves: RHEL-12469
 
-* Tue Nov 22 2022 Carlos Garnacho <cgarnach@redhat.com> - 3.1.2-3
+* Mon Aug 05 2024 Tomas Popela <tpopela@redhat.com> - 3.7.3-3
-- Do not include RSS miner service on RHEL
+- totem-pl-parser won't be part of RHEL 10
-  Resolves: rhbz#2041633
 
-* Tue Nov 01 2022 Carlos Garnacho <cgarnach@redhat.com> - 3.1.2-2
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.7.3-2
-- Backport seccomp rules from recent releases
+- Bump release for June 2024 mass rebuild
-  Resolves: rhbz#2130143
 
-* Wed Aug 25 2021 Kalev Lember <klember@redhat.com> - 3.1.2-1
+* Fri May 03 2024 Tomas Popela <tpopel@redhat.com> - 3.7.3-1
-- Update to 3.1.2
+- Update to 3.7.3 and sync with Fedora
+
+* Mon Feb 12 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 3.7~alpha-4
+- Bypass kernel landlock check during build
+
+* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 3.7~alpha-3
+- Rebuild for ICU 74
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 David King <amigadave@amigadave.com> - 3.7~alpha-1
+- Update to 3.7.alpha
+
+* Tue Oct 31 2023 Kalev Lember <klember@redhat.com> - 3.6.2-1
+- Update to 3.6.2
+
+* Fri Sep 29 2023 Sandro Bonazzola <sbonazzo@redhat.com> - 3.6.1-2
+- Do not include RSS miner service on RHEL/ELN
+  Original patch by Carlos Garnacho <cgarnach@redhat.com>
+  https://gitlab.com/redhat/centos-stream/rpms/tracker-miners/-/commit/4507ad77005aad38cb17b7a72a779446dce0981c
+
+* Thu Sep 28 2023 Kalev Lember <klember@redhat.com> - 3.6.1-1
+- Update to 3.6.1
+
+* Tue Sep 19 2023 Kalev Lember <klember@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+
+* Wed Sep 06 2023 Kalev Lember <klember@redhat.com> - 3.6~rc-1
+- Update to 3.6.rc
+
+* Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 3.6~beta-2
+- Fix required tracker version
+
+* Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 3.6~beta-1
+- Update to 3.6.beta
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6~alpha-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.1-3
+* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 3.6~alpha-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for ICU 73.2
-  Related: rhbz#1991688
+
+* Tue Jul 04 2023 Kalev Lember <klember@redhat.com> - 3.6~alpha-1
+- Update to 3.6.alpha
+
+* Sun May 14 2023 David King <amigadave@amigadave.com> - 3.5.2-1
+- Update to 3.5.2
+
+* Wed Apr 26 2023 David King <amigadave@amigadave.com> - 3.5.1-1
+- Update to 3.5.1
+
+* Mon Mar 20 2023 David King <amigadave@amigadave.com> - 3.5.0-1
+- Update to 3.5.0 (#2179709)
+
+* Sun Mar 05 2023 David King <amigadave@amigadave.com> - 3.5.0~rc-1
+- Update to 3.5.0.rc (#2160269)
+
+* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 3.5.0~beta-1
+- Update to 3.5.0.beta
+
+* Fri Feb 10 2023 David King <amigadave@amigadave.com> - 3.5.0~alpha-2
+- Fix depedency on tracker
+
+* Mon Feb 06 2023 David King <amigadave@amigadave.com> - 3.5.0~alpha-1
+- Update to 3.5.0.alpha
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 3.4.2-2
+- Rebuild for ICU 72
+
+* Tue Dec 06 2022 David King <amigadave@amigadave.com> - 3.4.2-1
+- Update to 3.4.2 (#2116593)
+
+* Wed Oct 26 2022 David King <amigadave@amigadave.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 3.4.0~rc-1
+- Update to 3.4.0.rc
+
+* Tue Aug 09 2022 Kalev Lember <klember@redhat.com> - 3.4.0~beta-1
+- Update to 3.4.0.beta
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.4.0~alpha-3
+- Rebuilt for ICU 71.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 15 2022 Kalev Lember <klember@redhat.com> - 3.4.0~alpha-1
+- Update to 3.4.0.alpha
+
+* Wed Jun 01 2022 David King <amigadave@amigadave.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Mon May 02 2022 Ray Strode <rstrode@redhat.com> - 3.3.0-2
+- file monitor fix
+  Resolves: #2079308
+
+* Sun Mar 20 2022 David King <amigadave@amigadave.com> - 3.3.0-1
+- Update to 3.3.0
+
+* Tue Mar 08 2022 David King <amigadave@amigadave.com> - 3.3.0~rc-1
+- Update to 3.3.0.rc
+
+* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 3.3.0~beta-1
+- Update to 3.3.0.beta
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 10 2022 David King <amigadave@amigadave.com> - 3.3.0~alpha-1
+- Update to 3.3.0.alpha
+
+* Mon Nov 01 2021 Kalev Lember <klember@redhat.com> - 3.2.1-1
+- Update to 3.2.1
+
+* Wed Sep 22 2021 Jan Beran <jaberan@redhat.com> - 3.2.0-2
+- If building for flatpak, adapt the behavior to work as a private
+  instance inside the flatpak
+
+* Sat Sep 18 2021 Kalev Lember <klember@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 3.2.0~rc-1
+- Update to 3.2.0.rc
+
+* Thu Aug 19 2021 Kalev Lember <klember@redhat.com> - 3.2.0~alpha.1-1
+- Update to 3.2.0.alpha.1
+
+* Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 3.1.2-3
+- BuildRequire systemd-rpm-macros instead of systemd
+- Avoid systemd_requires as per updated packaging guidelines
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 3.1.2-1
+- Update to 3.1.2
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.1-2
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 3.1.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuild for ICU 69
 
 * Sat Apr 03 2021 Kalev Lember <klember@redhat.com> - 3.1.1-1
 - Update to 3.1.1