--- rpms/smeserver-ddclient/contribs10/smeserver-ddclient.spec	2023/11/18 18:43:49	1.34
+++ rpms/smeserver-ddclient/contribs10/smeserver-ddclient.spec	2024/04/07 21:21:50	1.38
@@ -1,10 +1,10 @@
-# $Id: smeserver-ddclient.spec,v 1.33 2023/11/10 17:11:12 brianr Exp $
+# $Id: smeserver-ddclient.spec,v 1.37 2024/04/07 08:17:47 brianr Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-ddclient
 %define version 1.3.0
-%define release 28
+%define release 31
 
 Summary: ddclient panel for SME Server
 Name: %{name}
@@ -37,6 +37,8 @@ Patch20: smeserver-ddclient-1.3.0-locale
 Patch21: smeserver-ddclient-1.3.0-Remove-ddc-from-front-of-messages-labels-and-update-conf-template.patch
 Patch22: smeserver-ddclient-1.3.0-Update-for-3.11.1-deprecated-commands-in-template.patch
 Patch23: smeserver-ddclient-1.3.0-Update-SM2-code-for-new-services-and-protocols.patch
+Patch24: smeserver-ddclient-1.3.0-Alter-menu-category-for-new-arrangement.patch
+Patch25: smeserver-ddclient-1.3.0-Fix-template-declaration-file-and-localise-table-sm1.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
@@ -49,6 +51,16 @@ Requires: e-smith-formmagick
 AutoReqProv: no
 
 %changelog
+* Sun Apr 07 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.3.0-31.sme
+- add fix for namecheap to last patch [SME: 12598]
+
+* Sun Apr 07 2024 Brian Read <brianr@koozali.org> 1.3.0-30.sme
+- Merge template files for Virtual and free form domains and fix incompatibility with 3.11.2 [SME: 12598 ]
+- Localist free form table [SME: 12600 ]
+
+* Fri Mar 01 2024 Brian Read <brianr@koozali.org> 1.3.0-29.sme
+- Edit Menu entry to conform to new arrangements [SME: 12493]
+
 * Fri Nov 10 2023 Brian Read <brianr@koozali.org> 1.3.0-28.sme
 - Update template for deprecated commands and v3.11.1 ddclient [SME: 12427 ]
 - Update SM2 code to show all new protocols etc 
@@ -329,6 +341,8 @@ ddclient panel and config files for SMES
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %build
 perl createlinks
@@ -338,10 +352,12 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -ldump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
- --dir /etc/ddclient  'attr(0700,ddclient,ddclient)' \
 > %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
 
+# --dir /etc/ddclient  'attr(0600,ddclient,ddclient)' \
+# --dir /var/cache/ddclient 'attr(0600,ddclient,ddclient)' \
+
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
@@ -351,9 +367,9 @@ rm -rf $RPM_BUILD_ROOT
 #/sbin/e-smith/signal-event smanager-refresh
 #systemctl restart smanager
 
-if [ -f /usr/share/smanager/lib/SrvMngr.pm ]
-then
-       /usr/sbin/e-smith/signal-event smanager-refresh
+if (systemctl list-unit-files |grep smanager) then
+  echo "Smanager restart in spec file"
+  /sbin/e-smith/signal-event smanager-refresh;
 fi
 true