Fix jar branches

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

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 658e0e4b3ed71ecdb56c67b4f9c8f9c323329e65..38c6c840daf50286814d7ccc275283abcc39a063 100644 (file)
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@ -1,7 +1,7 @@
 Name:           argeo-freed
-Version:        2.3.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
@@ -15,6 +15,12 @@ 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
@@ -23,15 +29,9 @@ Requires:       libreswan
 
 %package roaming-client
 Summary:        FREEd roaming client
-Requires:       argeo-freed-libreswan unbound
-
-%description roaming-client
-
-%package roaming-host
-Summary:        FREEd roaming host
 Requires:       argeo-freed-libreswan
 
-%description roaming-host
+%description roaming-client
 
 %prep
 %setup -q
@@ -39,34 +39,48 @@ Requires:       argeo-freed-libreswan
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}
-cp -a ./etc/ipsec.d %{buildroot}%{_sysconfdir}
 
-mkdir -p %{buildroot}%{_unitdir}
-cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir}
+%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
-
 %{_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 apache-httpd.service
+%systemd_post freed-ipsec-roaming@.service
+%systemd_post freed-onresume.service
+%systemd_post freed-onsuspend.service
 
 %preun roaming-client
-%systemd_preun apache-httpd.service
+%systemd_preun freed-ipsec-roaming@.service
+%systemd_preun freed-onresume.service
+%systemd_preun freed-onsuspend.service
 
 %postun roaming-client
-%systemd_postun_with_restart apache-httpd.service
-
-%files roaming-host
-%{_sysconfdir}/ipsec.d/roaming-host.conf
-%{_sysconfdir}/ipsec.d/roaming-host-domain.conf.template
+%systemd_postun freed-ipsec-roaming@.service
+%systemd_postun freed-onresume.service
+%systemd_postun freed-onsuspend.service