Fix libexecdir in systemd user unit

This commit is contained in:
David King 2016-07-01 11:25:46 +01:00
parent 69fbbe24b6
commit cb2df97a93
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 798d15dcbb1e9c057706ed82eba4b42848afe8e9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Tue, 28 Jun 2016 10:37:28 +0200
Subject: tracker-store: use @libexecdir@ in systemd service
References: https://bugzilla.gnome.org/show_bug.cgi?id=768127
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
---
src/tracker-store/tracker-store.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tracker-store/tracker-store.service.in b/src/tracker-store/tracker-store.service.in
index 86af157..928a789 100644
--- a/src/tracker-store/tracker-store.service.in
+++ b/src/tracker-store/tracker-store.service.in
@@ -4,7 +4,7 @@ Description=Tracker metadata database store and lookup manager
[Service]
Type=dbus
BusName=org.freedesktop.Tracker1
-ExecStart=/usr/lib/tracker/tracker-store
+ExecStart=@libexecdir@/tracker-store
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
RestartPreventExitStatus=SIGKILL
--
cgit v0.12

View File

@ -16,7 +16,7 @@
Name: tracker
Version: 1.9.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Desktop-neutral search tool and indexer
Group: Applications/System
@ -27,6 +27,9 @@ Source0: https://download.gnome.org/sources/%{name}/1.9/%{name}-%{version
# only autostart in Gnome, see also
# https://bugzilla.redhat.com/show_bug.cgi?id=771601
Patch0: 0001-Only-autostart-in-GNOME-771601.patch
# Taken from upstream git.
# https://bugzilla.gnome.org/show_bug.cgi?id=768127
Patch1: tracker-1.9.0-user-unit-libexecdir.patch
BuildRequires: desktop-file-utils
BuildRequires: firefox
@ -175,6 +178,7 @@ This package contains the documentation for tracker
%setup -q
%patch0 -p1 -b .autostart-gnome
%patch1 -p1 -b .libexecdir
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@ -330,6 +334,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Fri Jul 01 2016 David King <amigadave@amigadave.com> - 1.9.0-2
- Fix libexecdir in systemd user unit
* Tue Jun 21 2016 David King <amigadave@amigadave.com> - 1.9.0-1
- Update to 1.9.0