--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/11/19 08:44:01	1.35
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2021/01/13 19:49:58	1.39
@@ -1,16 +1,20 @@
-# $Id: smeserver-manager.spec,v 1.34 2020/10/07 16:46:34 michel Exp $
+# $Id: smeserver-manager.spec,v 1.38 2021/01/07 18:55:41 michel Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.2
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: %{name}-%{version}-bz11185_initial.patch
+Patch1: %{name}-%{version}-update_systemd.patch
+Patch2: %{name}-%{version}-viewlogfiles_download.patch
+Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch
+Patch4: %{name}-%{version}-locales_menu.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -28,9 +32,10 @@ Requires: e-smith-lib >= 1.18.0-26
 Requires: e-smith-manager >= 2.4.0-22
 Requires:  perl(Mojolicious) >= 7.56
 Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
+Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
 Requires:  perl(Net::Netmask) >= 1.9
 #Requires: js-jquery > 2.2.4-3 (optional)
-Requires: pwauth
+#Requires: pwauth
 #Requires: perl(Apache::AuthTkt)
 
 Provides: server-manager
@@ -44,6 +49,10 @@ This RPM contributes the navigation bars
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
@@ -78,7 +87,6 @@ if [ -f /usr/share/javascript/jquery/lat
 then
     unlink %{dir_mngr}/themes/default/public/js/jquery.min.js
 fi
-systemctl disable smanager.service
 true
 
 %post
@@ -87,10 +95,6 @@ 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
@@ -98,6 +102,30 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme
+- Fix menu items not translated [SME: 11322]
+- Add other locales files
+
+* Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
+- Fix 404 error when trailing slash is missing
+- Fix missing translations for ibay and quota panels
+- Comment out pptp settings in remoteaccess panel
+- Fix 'sigusr1' exec for httpd  [SME: 11185]
+
+* Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
+- Fix download error on 'viewlogfiles' panel [SME: 11217]
+- Fix duplicate entries in log files to be chosen
+- Fix duplicate translation terms in 'General' lexicon
+
+* Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
+- Fix smanager-update event name
+- Move smanager service to /usr/lib/systemd
+- Fix Bugreport file download
+- Fix translations missing in 'viewlogfiles'
+- Remove Admin auth in httpd configuration
+- Add an optional alias for admin sign in.
+- Remove systemctl from .spec file
+
 * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
 - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)