From e9e35e71da6f9ecc477f4a9ce29bb0ad81de80fa Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Date: Thu, 3 Oct 2019 20:33:53 +0200
Subject: [PATCH] Add new files for systemd --user

---
 liri-power-manager/liri-power-manager.spec |  8 ++++++--
 liri-session/liri-session.spec             | 12 ++++++++++++
 liri-shell/liri-shell.spec                 |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/liri-power-manager/liri-power-manager.spec b/liri-power-manager/liri-power-manager.spec
index 95bf327..fd57a58 100644
--- a/liri-power-manager/liri-power-manager.spec
+++ b/liri-power-manager/liri-power-manager.spec
@@ -12,6 +12,7 @@ URL:            https://liri.io
 Source0:        https://github.com/lirios/%{modulename}/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}}/%{name}-%{?snaphash}%{!?snaphash:%{version}}.tar.gz
 
 BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.31.0
@@ -41,7 +42,9 @@ settings module to configure power consumption settings.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_liri} ..
+%{cmake_liri} \
+    -DINSTALL_SYSTEMDUSERUNITDIR:PATH=%{_userunitdir} \
+..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -69,4 +72,5 @@ fi
 %{_datadir}/liri-settings/translations/modules/power_*.qm
 %{_datadir}/liri-shell/indicators/power/
 %{_qt5_qmldir}/Liri/Power/
-%{_qt5_plugindir}/liri/sessionmodules/libpower.so
+%{_qt5_plugindir}/liri/daemon/libpower.so
+%{_userunitdir}/liri-*
diff --git a/liri-session/liri-session.spec b/liri-session/liri-session.spec
index 37d2f9d..c6c9b24 100644
--- a/liri-session/liri-session.spec
+++ b/liri-session/liri-session.spec
@@ -12,6 +12,7 @@ URL:            https://liri.io
 Source0:        https://github.com/lirios/%{modulename}/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}}/%{name}-%{?snaphash}%{!?snaphash:%{version}}.tar.gz
 
 BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  cmake(Qt5GSettings)
@@ -48,6 +49,7 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_liri} \
     -DINSTALL_SYSTEMDUSERUNITDIR:PATH=%{_userunitdir} \
+    -DINSTALL_SYSTEMDUSERGENERATORSDIR:PATH=%{_systemdusergeneratordir} \
 ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
@@ -72,16 +74,26 @@ fi
 %license LICENSE.LGPLv3
 %doc AUTHORS.md README.md
 %{_bindir}/liri-session
+%{_bindir}/liri-session-ctl
 %{_sysconfdir}/xdg/menus/*
 %{_datadir}/wayland-sessions/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/dbus-1/services/io.liri.*.service
+%{_libdir}/libLiri1Daemon.so.*
 %{_libdir}/libLiri1Session.so.*
+%{_qt5_plugindir}/liri/daemon/liblocale.so
+%{_liri_libexecdir}/liri-daemon
 %{_liri_libexecdir}/liri-launcher
+%{_userunitdir}/liri-*
+%{_systemdusergeneratordir}/liri-*
 
 
 %files devel
+%{_includedir}/LiriDaemon/
+%{_libdir}/libLiri1Daemon.so
+%{_libdir}/cmake/Liri1Daemon/
+%{_libdir}/pkgconfig/Liri1Daemon.pc
 %{_includedir}/LiriSession/
 %{_libdir}/libLiri1Session.so
 %{_libdir}/cmake/Liri1Session/
diff --git a/liri-shell/liri-shell.spec b/liri-shell/liri-shell.spec
index d243d0e..65f5f6d 100644
--- a/liri-shell/liri-shell.spec
+++ b/liri-shell/liri-shell.spec
@@ -12,6 +12,7 @@ URL:            https://liri.io
 Source0:        https://github.com/lirios/%{modulename}/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}}/%{name}-%{?snaphash}%{!?snaphash:%{version}}.tar.gz
 
 BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -98,7 +99,7 @@ fi
 %doc AUTHORS.md README.md
 %{_datadir}/liri-shell/
 %{_datadir}/glib-2.0/schemas/*
-%{_userunitdir}/*
+%{_userunitdir}/liri-*
 %{_liri_libexecdir}/liri-shell
 %{_liri_libexecdir}/liri-shell-helper
 %{_qt5_qmldir}/Liri/Launcher/