Name: argeo-freed
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
Summary: Utilities for a FREEd compatible domain
Summary: FREEd Argeo CMS services
Requires: argeo-cms
-%package cms-user
-Summary: FREEd Argeo CMS user services
-Requires: argeo-cms
-
%description cms
%package libreswan
%description roaming-client
-%package roaming-host
-Summary: FREEd roaming host
-Requires: argeo-freed-libreswan
-
-%description roaming-host
-
%prep
%setup -q
%build
%install
-mkdir -p %{buildroot}%{_bindir}
-cp -a ./usr/bin/* %{buildroot}%{_bindir}
-
-mkdir -p %{buildroot}%{_sysconfdir}
-cp -a ./etc/* %{buildroot}%{_sysconfdir}
-
-mkdir -p %{buildroot}%{_datadir}
-cp -a ./usr/share/* %{buildroot}%{_datadir}
-
-mkdir -p %{buildroot}%{_unitdir}
-cp -a ./usr/lib/systemd/system/* %{buildroot}%{_unitdir}
-
-mkdir -p %{buildroot}%{_userunitdir}
-cp -a ./usr/lib/systemd/user/* %{buildroot}%{_userunitdir}
-
-mkdir -p %{buildroot}%{_libexecdir}
-cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
%files cms
%attr(755, root, root) %{_bindir}/argeo
%attr(755, root, root) %{_bindir}/jshc
+%{_sysconfdir}/default/argeo
%{_sysconfdir}/argeo.d
-%{_datadir}/argeo
-%{_unitdir}/argeo@.service
-
-%files cms-user
-%{_sysconfdir}/argeo.user.d
-%{_userunitdir}/argeo@.service
+%{_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
-
-%post cms-user
-%systemd_user_post argeo@.service
-
-%preun cms-user
-%systemd_user_preun argeo@.service
-
-%postun cms-user
-%systemd_user_postun argeo@.service
+%systemd_user_postun argeo.service
%post roaming-client
%systemd_post freed-ipsec-roaming@.service
%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