packaging: have a X11-specific unitfile for display-service

The "notifications-display" service was not starting
correctly under X11. Create a proper systemd unitfile.

Change-Id: I3c40619d0d40cd0d40670dc28d7883cd71db664a
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>

diff --git a/Makefile.am b/Makefile.am
index 4f1528a..7e95034 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,9 @@ bluetooth_notification_client_LDADD = $(TIZEN_LIBS)
 
 SCRIPT_IN_FILES = \
      notifications.service.in \
-     notifications-display.service.in \
-     notifications-display-ivi.service.in
+     notifications-display-ivi.service.in \
+     notifications-display-x11.service.in \
+     notifications-display-wayland.service.in
 
 install-data-hook:
        $(mkinstalldirs) $(DESTDIR)/usr/lib/systemd/system/

diff --git a/configure.ac b/configure.ac
index d09481d..7dc41d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,6 @@ PKG_CHECK_MODULES([TIZEN], [eina ecore com-core notification dbus-1 bluetooth-ap
 AC_SUBST(TIZEN_CFLAGS)
 AC_SUBST(TIZEN_LIBS)
 
-AC_CONFIG_FILES([Makefile plugins/Makefile notifications.service notifications-display.service notifications-display-ivi.service])
+AC_CONFIG_FILES([Makefile plugins/Makefile notifications.service notifications-display-ivi.service notifications-display-x11.service notifications-display-wayland.service])
 AC_PROG_RANLIB([ranlib])
 AC_OUTPUT

diff --git a/notifications-display.service.in b/notifications-display-wayland.service.in
similarity index 100%
rename from notifications-display.service.in
rename to notifications-display-wayland.service.in

diff --git a/notifications-display-x11.service.in b/notifications-display-x11.service.in
new file mode 100644 (file)
index 0000000..627d623
--- /dev/null
+++ b/notifications-display-x11.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Notifications Popup daemon
+Requires=notifications.service display-manager-run.service
+After=notifications.service display-manager-run.service
+
+[Service]
+ExecStart=/usr/bin/notification-display-service
+Environment=DISPLAY=:0
+
+[Install]
+WantedBy=default.target

diff --git a/packaging/notification-service.spec b/packaging/notification-service.spec
index 67b4be7..72d300e 100644 (file)
--- a/packaging/notification-service.spec
+++ b/packaging/notification-service.spec
@@ -1,3 +1,4 @@
+%bcond_with x
 %bcond_with wayland
 
 Name:       notification-service
@@ -36,7 +37,7 @@ This package provides unit test used in the development of the notification serv
 
 %build
 
-%autogen
+%reconfigure
 make %{?_smp_mflags}
 
 
@@ -49,7 +50,12 @@ mkdir -p %{buildroot}/%{_unitdir_user}/default.target.wants
 install -m 0644 notifications-display-ivi.service %{buildroot}/%_unitdir_user/notifications-display.service
 ln -s ../notifications-display.service  %{buildroot}/%{_unitdir_user}/default.target.wants/notifications-display.service
 %else
-install -m 0644 notifications-display.service %{buildroot}/%_unitdir/
+%if %{with x}
+install -m 0644 notifications-display-x11.service %{buildroot}/%_unitdir/notifications-display.service
+%endif
+%if %{with wayland}
+install -m 0644 notifications-display-wayland.service %{buildroot}/%_unitdir/notifications-display.service
+%endif
 %install_service default.target.wants notifications-display.service
 %endif