--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/02/29 19:08:19	1.14
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/04/07 13:29:49	1.17
@@ -1,10 +1,10 @@
-# $Id: smeserver-manager.spec,v 1.13 2020/02/19 20:05:06 michel Exp $
+# $Id: smeserver-manager.spec,v 1.16 2020/03/29 15:20:59 brianr Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 11
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,9 @@ Patch7: smeserver-manager-0.1.0-navigati
 Patch8: smeserver-manager-0.1.0-theme_navig_message.patch
 Patch9: smeserver-manager-0.1.0-domains_pseudos_hosts.patch
 Patch10: smeserver-manager-0.1.0-remotax_users_logs.patch
+Patch11: smeserver-manager-0.1.0-localnetworks-panel-remove-adminlte.patch
+Patch12: smeserver-manager-0.1.0-localnetworks-remove-db-call-from-del.patch
+Patch13: smeserver-manager-0.1.0-portforwarding-localnetwork-cleanup.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -36,6 +39,19 @@ Requires: perl(Apache::AuthTkt)
 AutoReqProv: no
 
 %changelog
+* Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-14.sme
+- Add in portforwarding panel
+- Clean up localnetwork panel code
+
+* Sun Mar 29 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-13.sme
+- Remove Db call in LN_del template
+- Use Sme-error css class and make sure parameters applied to error message
+- Remove creation of AdminLTE directories on install
+
+* Fri Mar 20 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-12.sme
+- Add panels : localnetworks
+- Delete AdminLTE code  - will get added into new rpm
+
 * Sat Feb 29 2020 Michel Begue <mab974@gmail.com> 0.1.0-11.sme
 - Add panels : remoteaccess, useraccounts and viewlogfiles
 - Fix 'bugreport' download
@@ -817,6 +833,9 @@ This RPM contributes the navigation bars
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 # Force creation of potentially empty directories
@@ -826,8 +845,8 @@ mkdir -p root/home/e-smith/db/navigation
 mkdir -p root/etc/e-smith/web/common/css
 mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images
-mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp}
-mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials}
+#mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp}
+#mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials}
 
 gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c
 
@@ -917,8 +936,8 @@ chown root:admin /etc/e-smith/web/panels
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
-chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
-chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
+#chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
+#chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 chown root:admin /etc/e-smith/web/functions2/wrapper2