--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/04/11 20:28:10	1.20
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/05/08 13:02:16	1.25
@@ -1,15 +1,15 @@
-# $Id: smeserver-manager.spec,v 1.19 2020/04/11 17:08:20 michel Exp $
+# $Id: smeserver-manager.spec,v 1.24 2020/04/27 07:24:02 michel Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 17
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
-Source: %{name}-%{version}.tar.xz
+Source: %{name}-0.1.0.tar.xz
 Patch0: %{name}-0.1.0-bz10506.patch
 Patch1: %{name}-add-basic-files.patch
 Patch2: %{name}-0.1.0-mojo_struct.patch
@@ -26,6 +26,10 @@ Patch12: %{name}-0.1.0-localnetworks-rem
 Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch
 Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch
 Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch
+Patch16: %{name}-0.1.0-remove_tests.patch
+Patch17: %{name}-0.1.0-routes_locales_navig.patch
+Patch18: %{name}-0.1.0-error_success_routes_locales.patch
+Patch19: %{name}-0.1.0-translation_themes.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -37,19 +41,42 @@ Requires: perl-Mojolicious-Plugin-I18N >
 Requires: pwauth
 Requires: perl(Apache::AuthTkt)
 #Requires: js-jquery > 2.2.4-3 (optional)
-Provides: server-manager2
+Provides: server-manager
 AutoReqProv: no
 
 %define dir_mngr /etc/e-smith/web/panels/manager2
 
 %changelog
-* Sat Apr 11 2020 Michel Begue <mab974@gmail.com> 0.1.0-17.sme
+* Fri May 08 2020 Michel Begue <mab974@gmail.com> 0.1.0-22.sme
+- Fix translation in 'useraccounts' panel
+- Restore theme switcher route
+- Fix theme switcher redirection
+- fix lexicon file not found [SME: 10927]
+
+* Mon Apr 27 2020 Michel Begue <mab974@gmail.com> 0.1.0-21.sme
+- Fix error and success management
+- Optimize Routes (number)
+- Delete share_dir variable
+- Attach Locale lexicon to Panel and Panel?
+- Fix lack of translation of first page
+
+* Wed Apr 15 2020 Michel Begue <mab974@gmail.com> 0.1.0-20.sme
+- Patch the I18N plugin to accept namespace changes
+- Split global locales files to module level
+- Consider additional contrib locales files
+- Consider additional contrib routes and navigation item
+- fix colour button in portforwarding panel
+- fix missing esmith::util in starterwebsite panel
+
+* Tue Apr 14 2020 Michel Begue <mab974@gmail.com> 0.1.0-19.sme
+- Remove tests : useraccounts, wbl
+
+* Sat Apr 11 2020 Michel Begue <mab974@gmail.com> 0.1.0-18.sme
 - Add panels : emailaccess, yum, backup
 - Fix Rendering comments in portforwarding & localnetworks panels
 - Css and images files added (from manager).
 - Initial javascript in navigation added (jQuery) -optional-
 - Add 'Heading...'  navigation informations in controllers
-- Remove wbl and account tests
 - Show Themes_switch if there is more than one theme
 
 * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-15.sme
@@ -854,13 +881,18 @@ This RPM contributes the navigation bars
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 perl createlinks
 
 # Force creation of potentially empty directories
 mkdir -p root/etc/e-smith/web/functions2
-mkdir -p root/home/e-smith/db/navigation
+mkdir -p root/etc/e-smith/db/routes
+mkdir -p root/home/e-smith/db/navigation2
 mkdir -p root%{dir_mngr}/html
 mkdir -p root%{dir_mngr}/cgi-bin/srvmngr/themes/default/public/css