X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=argeo-freed.spec;fp=argeo-freed.spec;h=2912049812f4b96634d3e06b7666a928a75356cb;hb=68b7cd4d1b7d7c2d8e8c517f8b0da14d5d5c0822;hp=1357e2f65925867b4ebb4ea9a5093714f29344a6;hpb=72ad42b0a2280a5a842a94a6cf43748c74bc4113;p=gpl%2Fargeo-freed.git

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 1357e2f..2912049 100644
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@ -1,5 +1,5 @@
 Name:           argeo-freed
-Version:        2.3.5
+Version:        2.3.6
 Release:        1%{?dist}
 Summary:        Utilities for a FREEd compatible domain
 
@@ -19,10 +19,6 @@ BuildRequires: systemd-rpm-macros
 Summary:        FREEd Argeo CMS services
 Requires:       argeo-cms
 
-%package cms-user
-Summary:        FREEd Argeo CMS user services
-Requires:       argeo-cms
-
 %description cms
 
 %package libreswan
@@ -37,75 +33,41 @@ Requires:       argeo-freed-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}/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
@@ -121,7 +83,3 @@ cp -a ./usr/libexec/ipsec %{buildroot}%{_libexecdir}
 %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