From e0b8076eacfeafcdbd70bb233b00ab297b0f7847 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Tue, 25 Feb 2014 11:01:41 +0200 Subject: [PATCH] packaging: bumped version, updated changelog. Change-Id: Icde630050937243fe3d28f65f2099f30d2e9d4f6 --- packaging/murphy.changes | 4 ++++ packaging/murphy.spec | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packaging/murphy.changes b/packaging/murphy.changes index e1cdc07..fd78e67 100644 --- a/packaging/murphy.changes +++ b/packaging/murphy.changes @@ -1,3 +1,7 @@ +* Fri Feb 25 2014 Krisztian Litkey - 0.0.48 +- system-monitor: cgroup Lua bindings improvements and fixes. +- system-controller: fix a crash in screen resource management. + * Fri Feb 21 2014 Krisztian Litkey - 0.0.47 - system-controller: support for disabling single windows (surfaces). - system-monitor: support for cgroup CPU usage/load monitoring. diff --git a/packaging/murphy.spec b/packaging/murphy.spec index a903bc7..87866e7 100644 --- a/packaging/murphy.spec +++ b/packaging/murphy.spec @@ -27,7 +27,7 @@ Summary: Murphy policy framework Name: murphy -Version: 0.0.47 +Version: 0.0.48 Release: 1 License: BSD-3-Clause Group: System/Service @@ -216,6 +216,7 @@ Group: System/Service %package system-controller Summary: Murphy IVI System Controller plugin Group: System/Service +Requires: ico-uxf-homescreen Conflicts: murphy-ivi-resource-manager %endif @@ -507,12 +508,16 @@ ldconfig # prevent system controller from starting rm -f %{systemddir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path # instead launch just ico-homescreen -ln -s %{systemddir}/user/murphy-wait-for-launchpad-ready.path %{systemddir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path - +rm -f %{systemddir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path +ln -s %{systemddir}/user/murphy-wait-for-launchpad-ready.path \ + %{systemddir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path %postun system-controller rm -f %{systemddir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path -ln -s %{systemddir}/user/ico-uxf-wait-launchpad-ready.path %{systemddir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path +if [ -f %{systemddir}/user/ico-uxf-wait-launchpad-ready.path ]; then + ln -sf %{systemddir}/user/ico-uxf-wait-launchpad-ready.path \ + %{systemddir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path +fi %endif %if %{?_with_squashpkg:1}%{!?_with_squashpkg:0} -- 2.7.4