Improve freed-init

[gpl/argeo-freed.git] / argeo-freed.spec

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 3f18112519caa67f068c3cbcc6249adc4cd2a26a..9e197c8c4da0697bafa5347814d68c7afbcf87de 100644 (file)
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@ -1,5 +1,5 @@
 Name:           argeo-freed
-Version:        1.0
+Version:        2.3.1
 Release:        1%{?dist}
 Summary:        Enrollment into a FREEd compatible domain
 
@@ -7,6 +7,12 @@ License:        GPL
 URL:            http://www.argeo.org
 Source0:        %{name}-%{version}.tar.gz
 
+BuildArch:      noarch
+
+# Required for the %{_unitdir} and %{_sysusersdir} macros
+BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
+
 %description
 
 %package libreswan
@@ -17,13 +23,13 @@ Requires:       libreswan
 
 %package roaming-client
 Summary:        FREEd roaming client
-Requires:       freed-libreswan unbound
+Requires:       argeo-freed-libreswan unbound
 
 %description roaming-client
 
 %package roaming-host
 Summary:        FREEd roaming host
-Requires:       freed-libreswan
+Requires:       argeo-freed-libreswan
 
 %description roaming-host
 
@@ -36,8 +42,8 @@ Requires:       freed-libreswan
 mkdir -p %{buildroot}%{_sysconfdir}
 cp -a ./etc/ipsec.d %{buildroot}%{_sysconfdir}
 
-mkdir -p %{buildroot}%{_libdir}
-cp -a ./usr/lib/systemd %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_unitdir}
+cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir}
 
 mkdir -p %{buildroot}%{_libexecdir}
 cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
@@ -48,14 +54,25 @@ cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
 %files roaming-client
 %{_sysconfdir}/ipsec.d/roaming.conf
 
-%{_libdir}/systemd/system/freed-ipsec-roaming@.service
-%{_libdir}/systemd/system/freed-onresume.service
-%{_libdir}/systemd/system/freed-onsuspend.service
+%{_unitdir}/freed-ipsec-roaming@.service
+%{_unitdir}/freed-onresume.service
+%{_unitdir}/freed-onsuspend.service
+
+%post roaming-client
+%systemd_post freed-ipsec-roaming@.service
+%systemd_post freed-onresume.service
+%systemd_post freed-onsuspend.service
+
+%preun roaming-client
+%systemd_preun freed-ipsec-roaming@.service
+%systemd_preun freed-onresume.service
+%systemd_preun freed-onsuspend.service
+
+%postun roaming-client
+%systemd_postun freed-ipsec-roaming@.service
+%systemd_postun freed-onresume.service
+%systemd_postun freed-onsuspend.service
 
 %files roaming-host
 %{_sysconfdir}/ipsec.d/roaming-host.conf
 %{_sysconfdir}/ipsec.d/roaming-host-domain.conf.template
-
-%changelog
-* Tue Mar 07 2023 Mathieu Baudier <mbaudier@argeo.org>
-- Initial packaging