Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with upstream to have tracker:available on all the graphs. JB#55691 OMP#JOLLA-413 #6

Merged
merged 2 commits into from
Dec 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions rpm/tracker-miners.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ URL: https://gnome.pages.gitlab.gnome.org/tracker/
Source0: %{name}-%{version}.tar.bz2
Source1: 10-rtf.rule
Source2: 10-csv.rule
Source3: tracker-reset.sh
Patch1: 0001-Tracker-config-overrides.patch
Patch2: 0002-Fix-systemd-unit-files.patch
Patch3: 0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch
Expand Down Expand Up @@ -46,6 +47,7 @@ BuildRequires: pkgconfig(libtiff-4) >= 3.8.2
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(systemd)
BuildRequires: giflib-devel
BuildRequires: oneshot

Requires: systemd-user-session-targets
Requires(post): /sbin/ldconfig
Expand Down Expand Up @@ -93,11 +95,14 @@ ln -s ../tracker-miner-fs-3.service %{buildroot}%{_userunitdir}/post-user-sessio
cp -a %{SOURCE1} %{buildroot}%{_datadir}/tracker3-miners/extract-rules/
cp -a %{SOURCE2} %{buildroot}%{_datadir}/tracker3-miners/extract-rules/

install -D -m 755 %{SOURCE3} %{buildroot}/%{_oneshotdir}/tracker-reset.sh

%find_lang tracker3-miners

%post
/sbin/ldconfig
glib-compile-schemas /usr/share/glib-2.0/schemas/
add-oneshot --now --new-users --all-users tracker-reset.sh || :
Tomin1 marked this conversation as resolved.
Show resolved Hide resolved
if [ "$1" -ge 1 ]; then
systemctl-user daemon-reload || :
systemctl-user stop tracker-extract-3.service || :
Expand Down Expand Up @@ -128,3 +133,4 @@ fi
%{_datadir}/tracker3-miners/
%{_userunitdir}/tracker-*.service
%{_userunitdir}/post-user-session.target.wants/tracker-miner-fs-3.service
%attr(0755, -, -) %{_oneshotdir}/tracker-reset.sh
5 changes: 5 additions & 0 deletions rpm/tracker-reset.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#/bin/sh
if [ ! -e ~/.local/share/tracker-migrated ]; then
tracker3 reset -s
touch ~/.local/share/tracker-migrated
fi