--- rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2020/11/05 17:12:04	1.1
+++ rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2021/03/15 17:11:44	1.2
@@ -2,13 +2,14 @@ Summary: Package to integrate GeneWeb (V
 %define name smeserver-geneweb
 Name: %{name}
 %define version 2.3.0
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Applications/Internet
 Source: %{name}-%{version}.tar.xz
-#Patch0: %{name}-%{version}-init_v10.patch
+Patch0: %{name}-%{version}-init_v10_systemd.patch
+Patch1: %{name}-%{version}-to_smanager.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -16,12 +17,18 @@ Requires: geneweb >= 6.08
 Requires: smeserver-release >= 10.0
 Requires: e-smith-formmagick >= 2.4.0-1
 BuildRequires: e-smith-devtools
+AutoReqProv: no
 
 %description
 This RPM must be installed after the geneweb*.el6.sme package
 to complete the integration for SME Server.
 
 %changelog
+* Mon Mar 15 2021 Michel Begue <mab974@gmail.com> 2.3.0-2.sme
+- change geneweb & gwsetup to systemd services
+- add smeserver-geneweb-update event
+- add template and controller for smanager
+
 * Thu Nov 05 2020 Michel Begue <mab974@gmail.com> 2.3.0-1.sme
 - first import to sme 10 for geneweb v6.08
 
@@ -46,7 +53,8 @@ to complete the integration for SME Serv
 rm -rf $RPM_BUILD_ROOT
 
 %setup
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -67,8 +75,8 @@ echo "%doc COPYING" >> %{name}-%{version
 %files -f %{name}-%{version}-filelist
 
 %defattr(-,root,root)
-%attr(755, root, root) /var/service/geneweb/log/run
-%attr(755, root, root) /var/service/gwsetup/log/run
+%attr(755, root, root) /usr/lib/systemd/systemd-geneweb
+%attr(755, root, root) /usr/lib/systemd/systemd-gwsetup
 
 
 %clean 
@@ -77,25 +85,14 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 
 %post
-ln -s /var/service/geneweb /service/geneweb 
-touch /var/service/geneweb/down
-ln -s /etc/rc.d/init.d/daemontools /etc/rc.d/init.d/supervise/geneweb 
-##ln -s /etc/rc.d/init.d/e-smith-service /etc/rc.d/rc7.d/S98geneweb 
 mkdir -p /var/log/geneweb
-chown smelog:smelog /var/log/geneweb
-ln -s /var/service/gwsetup /service/gwsetup 
-touch /var/service/gwsetup/down
-ln -s /etc/rc.d/init.d/daemontools /etc/rc.d/init.d/supervise/gwsetup 
-##ln -s /etc/rc.d/init.d/e-smith-service /etc/rc.d/rc7.d/S98gwsetup 
+chown geneweb:geneweb /var/log/geneweb
 mkdir -p /var/log/gwsetup
-chown smelog:smelog /var/log/gwsetup
+chown geneweb:geneweb /var/log/gwsetup
 
 %preun
 /sbin/e-smith/db configuration setprop geneweb status disabled
 /sbin/e-smith/db configuration setprop gwsetup status disabled
-#/etc/rc.d/init.d/geneweb stop
-#/etc/rc.d/init.d/gwsetup stop
-/usr/bin/sv stop geneweb
-/usr/bin/sv stop gwsetup
+/usr/bin/systemctl stop geneweb gwsetup
 
 %postun