I have made the following changes intended for : CE:MW:Shared / maliit-framework
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7370 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 7370: Messages from BOSS: State: review at 2012-11-12T15:31:10 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:MW:Shared / maliit-framework -> CE:MW:Shared / maliit-framework changes files: -------------- --- maliit-framework.changes +++ maliit-framework.changes @@ -0,0 +1,6 @@ +* Mon Nov 12 2012 Pekka Lundstrom <[email protected]> - 0.81.3.0.1 +- Added patch enable-systemd-activation.patch and edited maliit-server.service + so that dbus activation is directed to systemd + Fixes NEMO#567 : Maliit-server is started by dbus and systemd. Dbus start file should + be converted to use systemd + new: ---- enable-systemd-activation.patch spec files: ----------- --- maliit-framework.spec +++ maliit-framework.spec @@ -20,6 +20,7 @@ Source3: maliit-server.service Source100: maliit-framework.yaml Patch0: maliit-framework-0.81.3.0.1-version.patch +Patch1: enable-systemd-activation.patch Requires: dbus-x11 Requires(pre): %{_bindir}/gconftool-2 Requires(preun): %{_bindir}/gconftool-2 @@ -136,6 +137,8 @@ # maliit-framework-0.81.3.0.1-version.patch %patch0 -p1 +# enable-systemd-activation.patch +%patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ enable-systemd-activation.patch (new) --- enable-systemd-activation.patch +++ enable-systemd-activation.patch @@ -0,0 +1,11 @@ +diff --git a/connection/org.maliit.server.service.in b/connection/org.maliit.server.service.in +index 6b38706..3d7bc00 100644 +--- a/connection/org.maliit.server.service.in ++++ b/connection/org.maliit.server.service.in +@@ -1,4 +1,5 @@ + [D-BUS Service] + Name=org.maliit.server +-Exec=@M_IM_INSTALL_BIN@/maliit-server @MALIIT_SERVER_ARGUMENTS@ ++Exec=@M_IM_INSTALL_BIN@/maliit-server @MALIIT_SERVER_ARGUMENTS@ -remote-theme ++SystemdService=maliit-server.service + ++++++ maliit-framework.yaml --- maliit-framework.yaml +++ maliit-framework.yaml @@ -9,6 +9,7 @@ - "%{name}-%{version}.tar.bz2" Patches: - maliit-framework-0.81.3.0.1-version.patch + - enable-systemd-activation.patch ExtraSources: - maliit-server.desktop;%{_sysconfdir}/xdg/autostart - maliit-server.sh;%{_sysconfdir}/profile.d ++++++ maliit-server.service --- maliit-server.service +++ maliit-server.service @@ -5,5 +5,6 @@ [Service] ExecStart=/usr/bin/maliit-server -remote-theme - +Type=dbus +BusName=org.maliit.server
