--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/11/19 08:44:01 1.35 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/11/21 08:43:54 1.36 @@ -1,16 +1,17 @@ -# $Id: smeserver-manager.spec,v 1.34 2020/10/07 16:46:34 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.2 -%define release 1 +%define release 2 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -28,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 @@ -44,6 +46,7 @@ This RPM contributes the navigation bars %prep %setup %patch0 -p1 +%patch1 -p1 %build perl createlinks @@ -78,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 @@ -87,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 @@ -98,6 +96,15 @@ true %defattr(-,root,root) %changelog +* Fri Nov 20 2020 Michel Begue 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 0.1.2-1.sme - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)