--- rpms/smeserver-ddclient/contribs10/smeserver-ddclient.spec	2020/06/12 07:57:22	1.3
+++ rpms/smeserver-ddclient/contribs10/smeserver-ddclient.spec	2020/07/01 05:41:03	1.5
@@ -1,10 +1,10 @@
-# $Id: smeserver-ddclient.spec,v 1.2 2020/06/08 17:16:55 brianr Exp $
+# $Id: smeserver-ddclient.spec,v 1.4 2020/06/28 09:11:42 brianr Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-ddclient
-%define version 1.2.1
-%define release 17
+%define version 1.3.0
+%define release 3
 
 Summary: ddclient panel for SME Server
 Name: %{name}
@@ -13,20 +13,7 @@ Release: %{release}%{?dist}
 License: GNU GPL version 2
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-ddclient-1.2.1-locale-2015-07-01.patch
-Patch1: Namecheap_translation.patch 
-Patch2: smeserver-ddclient-1.2.1.bz8975.spdns.de.patch
-Patch3: smeserver-ddclient-1.2.1.bz8961.customDNS.patch
-Patch4: smeserver-ddclient-1.2.1-locale-2015-07-11.patch
-Patch5: smeserver-ddclient-1.2.1-locale-2015-09-12.patch
-Patch6: smeserver-ddclient-1.2.1-locale-2016-03-09.patch
-Patch7: smeserver-ddclient-1.2.1-locale-2017-12-02.patch
-Patch8: smeserver-ddclient-1.2.1-bz10593-spdns-spdyn.patch
-Patch9: smeserver-ddclient-1.2.1-bz9450-new-ip-detection.patch
-Patch10: smeserver-ddclient-1.2.1-locale-2019-12-07.patch
-Patch11: smeserver-ddclient-1.2.1-allow-ampersand-in-username-needed-for-noip.patch
-Patch12: smeserver-ddclient-1.2.1-add-server-manager2-panels.patch
-Patch13: smeserver-ddclient-1.2.1-Update-for-Apache-Mod-Proxy-based-server2.patch
+Patch0: smeserver-ddclient-1.3.0-Add-in-extra-services.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
@@ -34,11 +21,20 @@ Obsoletes: sme7-ddclient
 BuildArchitectures: noarch
 Requires: e-smith-release >= 10.0
 Requires: smeserver-manager >= 0.1.0-24
-Requires: ddclient >= 3.8.1
+Requires: ddclient >= 3.9.1
 Requires: e-smith-formmagick
 AutoReqProv: no
 
 %changelog
+* Tue Jun 30 2020 Brian Read <brianr@bjsystems.co.uk> 1.3.0-3.sme
+- Add in extra services from ddclient 3.9.1 [SME:10942 ]
+
+* Mon Jun 29 2020 Brian Read <brianr@bjsystems.co.uk> 1.3.0-2.sme
+- Sort out startup with systemd [SME:10942]
+
+* Sun Jun 28 2020 Brian Read <brianr@bjsystems.co.uk> 1.3.0-1.sme
+- Roll up all patches for SME10 [SME:10942]
+
 * Thu Jun 11 2020 Brian Read <brianr@bjsystems.co.uk> 1.2.1-17.sme
 - Update-for-Apache-Mod-Proxy-based-server2 [SME:10942 ]
 
@@ -208,19 +204,6 @@ ddclient panel and config files for SME9
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 perl createlinks
@@ -236,7 +219,9 @@ echo "%doc COPYING"  >> %{name}-%{versio
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/e-smith/signal-event manager2-refresh
+systemctl enable ddclient
+systemctl start ddclient
+/sbin/e-smith/signal-event smanager-refresh
 systemctl restart smanager
 
 %files -f %{name}-%{version}-filelist