--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/06/11 06:15:35	1.27
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/08/17 17:17:11	1.32
@@ -1,10 +1,10 @@
-# $Id: smeserver-manager.spec,v 1.26 2020/06/08 17:27:18 michel Exp $
+# $Id: smeserver-manager.spec,v 1.31 2020/08/08 13:42:03 michel Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 24
+%define release 29
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -32,6 +32,13 @@ Patch18: %{name}-0.1.0-error_success_rou
 Patch19: %{name}-0.1.0-translation_themes.patch
 Patch20: %{name}-0.1.0-mojo-app_password_menus.patch
 Patch21: %{name}-0.1.0-missing_translations.patch
+Patch22: %{name}-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch
+Patch23: %{name}-0.1.0-start_service.patch
+Patch24: %{name}-0.1.0-datetime_quota.patch
+Patch25: %{name}-0.1.0-bz10976_bz10977_others.patch
+Patch26: %{name}-0.1.0-route_lexicon_locales.patch
+
+
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
@@ -42,6 +49,7 @@ Requires: e-smith-lib >= 1.18.0-26
 Requires: e-smith-manager >= 2.4.0-22
 Requires: perl-Mojolicious >= 6.44
 Requires: perl-Mojolicious-Plugin-I18N >= 1.6
+Requires: perl-Net-Netmask >= 1.9015
 #Requires: js-jquery > 2.2.4-3 (optional)
 Requires: pwauth
 #Requires: perl(Apache::AuthTkt)
@@ -78,6 +86,11 @@ This RPM contributes the navigation bars
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 perl createlinks
@@ -141,8 +154,10 @@ then
     mkdir %{dir_mngr}/themes/default/public/js
     ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
 fi
+/sbin/e-smith/expand-template /usr/share/smanager/conf/srvmngr.conf
 /sbin/e-smith/expand-template /etc/systemd/system/smanager.service
 systemctl enable smanager.service
+systemctl restart smanager.service
 true
 
 %postun
@@ -150,6 +165,35 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme
+- validate lexicon file before install
+- fix route url construction (+)
+- add authentication messages to locales
+
+* Fri Aug 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-28.sme
+- validate netmask in LocalNetworks [SME: 10976]
+- validate netmask in RemoteAccess [SME: 10977]
+- prettier action button
+- accept undescore in lexicon name
+- change route urls for LocalNetworks and Portforwarding
+- add rendering to LocalNetworks notification
+
+* Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme
+- Fix typo in %post here
+- Complete 'datetime' panel
+- Fix notification in 'quota' panel
+
+* Wed Jul 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-26.sme
+- Fix first start error
+- Fix incorrect messages and various typos in modules
+- Add possibility to hide menu(s) (requires jquery)
+
+* Sat Jun 13 2020 Michel Begue <mab974@gmail.com> 0.1.0-25.sme
+- Remove 'Starterwebsite' panel [SME: 8903]
+- Add choice for creating Pseudonyms [SME: 9457]
+- Change URL in 'useraccounts' templates
+- Change app to smanager in controller 'Swttheme'
+
 * Wed Jun 10 2020 Michel Begue <mab974@gmail.com> 0.1.0-24.sme
 - Fix missing translations for some panels