X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=argeo-freed.spec;h=38c6c840daf50286814d7ccc275283abcc39a063;hb=HEAD;hp=9e76e19e235cf96a08a524243ed50ea6239c716a;hpb=3d5a5fb9df0da37882bfe87662821d646e40811a;p=gpl%2Fargeo-freed.git

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 9e76e19..38c6c84 100644
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@ -1,53 +1,86 @@
 Name:           argeo-freed
-Version:        1.0
+Version:        2.1.4
 Release:        1%{?dist}
-Summary:        Enrollment into a FREEd compatible domain
+Summary:        Utilities for a FREEd compatible domain
 
 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 cms
+Summary:        FREEd Argeo CMS services
+Requires:       argeo-cms
+
+%description cms
 
 %package libreswan
+Summary:        FREEd extensions to libreswan
 Requires:       libreswan
 
 %description libreswan
 
 %package roaming-client
-Requires:       freed-libreswan unbound
+Summary:        FREEd roaming client
+Requires:       argeo-freed-libreswan
 
 %description roaming-client
 
-%package roaming-host
-Requires:       freed-libreswan
-
-%description roaming-host
-
 %prep
-%setup
+%setup -q
+
+%build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}
-cp -a ./etc/ipsec.d %{buildroot}%{_sysconfdir}
 
-mkdir -p %{buildroot}%{_libdir}
-cp -a ./usr/lib/systemd %{buildroot}%{_libdir}
+%files cms
+%attr(755, root, root) %{_bindir}/argeo
+%attr(755, root, root) %{_bindir}/jshc
 
-mkdir -p %{buildroot}%{_libexecdir}
-cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
+%{_sysconfdir}/default/argeo
+%{_sysconfdir}/argeo.d
+%{_sysconfdir}/argeo
+%{_unitdir}/argeo*.service
+%{_userunitdir}/argeo*.service
 
 %files libreswan
 %attr(755, root, root) %{_libexecdir}/ipsec
 
 %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
-
-%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
+%{_unitdir}/freed-ipsec-roaming@.service
+%{_unitdir}/freed-onresume.service
+%{_unitdir}/freed-onsuspend.service
+
+%post cms
+%systemd_post argeo@.service
+%systemd_user_post argeo.service
+
+%preun cms
+%systemd_preun argeo@.service
+%systemd_user_preun argeo.service
+
+%postun cms
+%systemd_postun argeo@.service
+%systemd_user_postun argeo.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