--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/10/07 16:46:34	1.34
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/11/21 08:43:54	1.36
@@ -1,48 +1,19 @@
-# $Id: smeserver-manager.spec,v 1.33 2020/10/05 15:43:13 michel Exp $
+# $Id: smeserver-manager.spec,v 1.35 2020/11/19 08:44:01 michel Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
-%define version 0.1.0
-%define release 31
+%define version 0.1.2
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
-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
-Patch3: %{name}-0.1.0-setuid_groups.patch
-Patch4: %{name}-0.1.0-reboot_ibays_theme.patch
-Patch5: %{name}-0.1.0-add-adminlte.patch
-Patch6: %{name}-0.1.0-navigation_header_listes.patch
-Patch7: %{name}-0.1.0-navigation_errors.patch
-Patch8: %{name}-0.1.0-theme_navig_message.patch
-Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch
-Patch10: %{name}-0.1.0-remotax_users_logs.patch
-Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch
-Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch
-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
-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
-Patch27: %{name}-0.1.0-I18N_cleanup_tests.patch
-Patch28: %{name}-0.1.0-yum_refresh_version.patch
-
+Source: %{name}-%{version}.tar.xz
+Patch0: %{name}-%{version}-bz11185_initial.patch
+Patch1: %{name}-%{version}-update_systemd.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
 #<Build tests>
@@ -58,6 +29,7 @@ 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
@@ -68,41 +40,13 @@ AutoReqProv: no
 
 %define dir_mngr /usr/share/smanager
 
-
 %description
-This RPM contributes the navigation bars for the smeserver-manager.
+This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
 
 %prep
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
 
 %build
 perl createlinks
@@ -137,7 +81,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
@@ -146,10 +89,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
@@ -157,6 +96,18 @@ true
 %defattr(-,root,root)
 
 %changelog
+* 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)
+
 * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme
 - smanager-refresh event come back
 - add smanager version in footer