Merge pull request #7 from nemomobile-packages/cleanup

Cleanup
sailfishos · Oct 31, 2014 · 31c04a6 · 31c04a6
2 parents c9c9246 + 3fbbd2b
commit 31c04a6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 167 deletions.
diff --git a/maliit-server.service-wayland → maliit-server.service b/maliit-server.service-wayland → maliit-server.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=The Maliit server
-After=lipstick.service pre-user-session.target booster-qt5.service
-Requires=dbus.socket pre-user-session.target
+After=dbus.socket pre-user-session.target booster-qt5.service lipstick.service
+Requires=dbus.socket pre-user-session.target booster-qt5.service lipstick.service
 
 [Service]
 ExecStart=/usr/bin/invoker --type=qt5 /usr/bin/maliit-server

diff --git a/maliit-server.service-x11 b/maliit-server.service-x11
diff --git a/rpm/maliit-framework-wayland.spec b/rpm/maliit-framework-wayland.spec
@@ -102,7 +102,7 @@ pushd maliit-framework
 %qmake_install
 popd
 install -D -m 0644 maliit-server.sh %{buildroot}%{_sysconfdir}/profile.d/maliit-server.sh
-install -D -m 0644 maliit-server.service-wayland %{buildroot}%{_libdir}/systemd/user/maliit-server.service
+install -D -m 0644 maliit-server.service %{buildroot}%{_libdir}/systemd/user/maliit-server.service
 mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
 ln -s ../maliit-server.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
 

diff --git a/rpm/maliit-framework-x11.spec b/rpm/maliit-framework-x11.spec
diff --git a/rpm/maliit-framework.changes b/rpm/maliit-framework.changes