--- rpms/softethervpn/contribs10/softethervpn.spec	2021/01/16 07:43:47	1.1
+++ rpms/softethervpn/contribs10/softethervpn.spec	2021/01/20 15:47:43	1.2
@@ -4,7 +4,7 @@
 %define dateversion 2020.03.20
 %define buildrelease beta
 %define version  %{majorversion}.%{minorversion}.%{buildversion}
-%define release 2
+%define release 3
 
 Name:           softethervpn
 Version:        %{majorversion}.%{minorversion}.%{buildversion}
@@ -53,13 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT/usr/bin/
 install -m 755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 755 -d $RPM_BUILD_ROOT/usr/lib/systemd/system
 pwd
 ls -lR
 install -m 755 centos/SOURCES/scripts/vpnserver $RPM_BUILD_ROOT/usr/bin/vpnserver
 install -m 755 centos/SOURCES/scripts/vpnbridge $RPM_BUILD_ROOT/usr/bin/vpnbridge
 install -m 755 centos/SOURCES/scripts/vpnclient $RPM_BUILD_ROOT/usr/bin/vpnclient
 install -m 755 centos/SOURCES/scripts/vpncmd $RPM_BUILD_ROOT/usr/bin/vpncmd
-install -m 755 centos/SOURCES/init.d/vpnserver $RPM_BUILD_ROOT/etc/rc.d/init.d/vpnserver
+#install -m 755 centos/SOURCES/init.d/vpnserver $RPM_BUILD_ROOT/etc/rc.d/init.d/vpnserver
+install -m 755 systemd/softether-vpnserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/vpnserver.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/bin/vpnbridge
 %{_usr}/bin/vpnclient
 %{_usr}/bin/vpncmd
+%{_usr}/lib/systemd/system/vpnserver.service
 %{_usr}/vpnserver/hamcore.se2
 %{_usr}/vpnserver/vpnserver
 %{_usr}/vpnbridge/hamcore.se2
@@ -82,11 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/vpnbridge/
 %{_usr}/vpnclient/
 %{_usr}/vpncmd/
-%{_initddir}/vpnserver
+#%{_initddir}/vpnserver
 %doc AUTHORS.TXT BUILD_UNIX.TXT BUILD_WINDOWS.TXT ChangeLog ChangeLog.txt LICENSE LICENSE.TXT README README.TXT THIRD_PARTY.TXT WARNING.TXT
 
 %post
-/sbin/chkconfig --add vpnserver
+#/sbin/chkconfig --add vpnserver
 
 #%postun
 #if [ "$1" -ge "1" ]; then
@@ -94,12 +97,16 @@ rm -rf $RPM_BUILD_ROOT
 #fi
 
 %preun
-if [ $1 -eq 0 ]; then
-	/sbin/service vpnserver stop >/dev/null 2>&1
-	/sbin/chkconfig --del vpnserver
-fi
+#if [ $1 -eq 0 ]; then
+#	/sbin/service vpnserver stop >/dev/null 2>&1
+#	/sbin/chkconfig --del vpnserver
+#fi
 
 %changelog
+* Sat Jan 16 2021 Brian Read <brianr@bjsystems.co.uk> %{majorversion}.%{minorversion}.%{buildversion}-3.sme
+- Import to SME10 tree [SME: 11326]
+- Copy systemd service file
+
 * Sat Mar 28 2020 Jean-Philipe Pialasse <tests@pialasse.com> 4.34.9744-2.sme
 - add PR202 for ListenIP parameter in order to bind softethernet only on one IP
   this will allow to keep https on internal interface for server-gateway mode