fixup! Use PathExists instead of ConditionPathExists

Change-Id: I614d83c5dc61a1a128dc871379dd590bb165035a

diff --git a/packaging/muse-server-display.path b/packaging/muse-server-display.path
deleted file mode 100644 (file)
index 1c1fe05..0000000
--- a/packaging/muse-server-display.path
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=muse server
-DefaultDependencies=no
-
-[Path]
-PathExists=/run/wayland-0
-

diff --git a/packaging/muse-server.path b/packaging/muse-server.path
new file mode 100644 (file)
index 0000000..1c1fe05
--- /dev/null
+++ b/packaging/muse-server.path
@@ -0,0 +1,7 @@
+[Unit]
+Description=muse server
+DefaultDependencies=no
+
+[Path]
+PathExists=/run/wayland-0
+

diff --git a/packaging/muse-server.service b/packaging/muse-server.service
index 9b78937ff2317a1f17e4cb11f6de2a8eb6d7a353..178a0e2ff2694b973e3f9d5be119b2cf9615b50b 100644 (file)
--- a/packaging/muse-server.service
+++ b/packaging/muse-server.service
@@ -17,6 +17,3 @@ EnvironmentFile=/run/xdg-root-env
 SupplementaryGroups=priv_mediastorage priv_camera priv_recorder
 Capabilities=cap_dac_override=i
 SecureBits=keep-caps
-
-[Install]
-WantedBy=multi-user.target

diff --git a/packaging/mused.spec b/packaging/mused.spec
index cacce0f7313217cc0888c3d33eadf587e2cbcfed..b94ea12777547ed69eb364643cb8ed8827b7ce4d 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -11,7 +11,7 @@ Source3:    muse-server-vd_product_tv.path
 Source4:    muse-server-vd_product_tv.service
 Source5:    muse-server-vd_product_audio.service
 Source6:    %{name}.notstrip
-Source7:    muse-server-display.path
+Source7:    muse-server.path
 BuildRequires: cmake
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(capi-system-info)
@@ -106,11 +106,12 @@ install -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/muse-server.service
 mkdir -p %{buildroot}%{_sysconfdir}/notstrip
 install -m 0644 %SOURCE6 %{buildroot}%{_sysconfdir}/notstrip/%{name}.notstrip
 install -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/muse-server.path
-install -m 0644 %SOURCE7 %{buildroot}%{_unitdir}/muse-server-display.path
 %else
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/muse-server.service
 %install_service multi-user.target.wants muse-server.service
+install -m 0644 %SOURCE7 %{buildroot}%{_unitdir}/muse-server.path
+%install_service paths.target.wants muse-server.path
 
 %endif
 %endif
@@ -145,6 +146,8 @@ chsmack -a "System::Shared" /var/log/%{name}
 %{_unitdir}/basic.target.wants/muse-server.service
 %else
 %{_unitdir}/multi-user.target.wants/muse-server.service
+%{_unitdir}/paths.target.wants/muse-server.path
+%{_unitdir}/muse-server.path
 %endif
 %endif
 %if ("%{_vd_cfg_product_type}" == "TV") || ("%{_vd_cfg_product_type}" == "LFD") || ("%{_vd_cfg_product_type}" == "HTV") || ("%{_vd_cfg_product_type}" == "AV") || ("%{_vd_cfg_product_type}" == "IWB") || ("%{_vd_cfg_product_type}" == "WALL")