[tracker-miners/wip/carlosg/parallel-installable: 2/19] tracker-miner-rss: Install versioned executable
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/parallel-installable: 2/19] tracker-miner-rss: Install versioned executable
- Date: Mon, 6 Apr 2020 15:47:17 +0000 (UTC)
commit 48cbec4449bc58f3c4449a3888b93a8eb3483492
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 23 19:54:01 2020 +0100
tracker-miner-rss: Install versioned executable
This is now installed as tracker-miner-rss-3, and referenced as such
everywhere.
src/miners/rss/meson.build | 7 ++++---
src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in | 4 ++--
src/miners/rss/tracker-miner-rss.desktop.in.in | 2 +-
src/miners/rss/tracker-miner-rss.service.in | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index a015ae4a5..bd84fae21 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -3,7 +3,8 @@ sources = [
'tracker-miner-rss.c',
]
-executable('tracker-miner-rss', sources,
+executable('tracker-miner-rss-@0@'.format(tracker_api_major),
+ sources,
dependencies: [libgrss, tracker_miner, tracker_miners_common_dep, tracker_extract_dep],
c_args: tracker_c_args,
install: true,
@@ -30,7 +31,7 @@ desktop_file_untranslated = configure_file(
desktop_file = custom_target('tracker-miner-rss-desktop-file',
input: desktop_file_untranslated,
- output: 'tracker-miner-rss.desktop',
+ output: 'tracker-miner-rss-@0@.desktop'.format(tracker_api_major),
command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
@@ -38,7 +39,7 @@ desktop_file = custom_target('tracker-miner-rss-desktop-file',
if get_option('systemd_user_services')
configure_file(
input: 'tracker-miner-rss.service.in',
- output: 'tracker-miner-rss.service',
+ output: 'tracker-miner-rss-@0@.service'.format(tracker_api_major),
configuration: conf,
install: true,
install_dir: systemd_user_services_dir)
diff --git a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
index 9296f979a..4a27c78c5 100644
--- a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
@@ -1,7 +1,7 @@
[D-BUS Service]
Name=org.freedesktop.Tracker3.Miner.RSS
-Exec=@libexecdir@/tracker-miner-rss
-SystemdService=tracker-miner-rss.service
+Exec=@libexecdir@/tracker-miner-rss-3
+SystemdService=tracker-miner-rss-3.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker3/Miner/RSS
diff --git a/src/miners/rss/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in.in
index fa570bb4e..de4de9a58 100644
--- a/src/miners/rss/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in.in
@@ -2,7 +2,7 @@
_Name=Tracker RSS/ATOM Feeds Miner
_Comment=Fetch RSS/ATOM feeds
Icon=
-Exec=@libexecdir@/tracker-miner-rss
+Exec=@libexecdir@/tracker-miner-rss-3
Terminal=false
Type=Application
Categories=Utility;
diff --git a/src/miners/rss/tracker-miner-rss.service.in b/src/miners/rss/tracker-miner-rss.service.in
index 2478b17be..5a48fd12e 100644
--- a/src/miners/rss/tracker-miner-rss.service.in
+++ b/src/miners/rss/tracker-miner-rss.service.in
@@ -5,7 +5,7 @@ ConditionUser=!root
[Service]
Type=dbus
BusName=org.freedesktop.Tracker3.Miner.RSS
-ExecStart=@libexecdir@/tracker-miner-rss
+ExecStart=@libexecdir@/tracker-miner-rss-3
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
RestartPreventExitStatus=SIGKILL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]