--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2022/01/05 10:22:17 1.58 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2023/04/26 20:24:16 1.67 @@ -1,10 +1,8 @@ -# $Id: smeserver-manager.spec,v 1.57 2021/12/27 17:28:17 michel Exp $ - Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.4 -%define release 11 +%define release 20 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -21,6 +19,13 @@ Patch6: smeserver-manager-0.1.4-fix-tran Patch7: smeserver-manager-0.1.4-format-for-dhcp-ips-in-review-config.patch Patch8: smeserver-manager-0.1.4-fix_backup_empty_selection_list.patch Patch9: smeserver-manager-0.1.4-toggle_password_and_menu-jquery_cond-csrf_get.patch +Patch10: smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch +Patch11: smeserver-manager-0.1.4-bz12110-untainting-printer.patch +Patch12: smeserver-manager-0.1.4-bz12111-untainting-date.patch +Patch13: smeserver-manager-0.1.4-bz11816_password_reset.patch +Patch14: smeserver-manager-0.1.4-Fix-typo-in-datetime-processing.patch +Patch15: smeserver-manager-0.1.4-Correct-Requires-slapd-ldap-in-systemd-service-file.patch +Patch16: smeserver-manager-0.1.4-yum_session_awstats.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -36,11 +41,16 @@ BuildRequires: e-smith-devtools Requires: e-smith-lib >= 1.18.0-26 Requires: e-smith-manager >= 2.4.0-22 +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 Requires: perl(Mojolicious) >= 7.56 Requires: perl(Mojolicious::Plugin::I18N) >= 1.6 Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12 Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8 Requires: perl(Net::Netmask) >= 1.9 +Requires: perl(DBM::Deep) >= 2.0011-1 +Requires: perl(Mojo::JWT) >= 0.08-1 +Requires: mutt >= 1.5.21 #Requires: js-jquery > 2.2.4-3 (optional) Provides: server-manager @@ -63,6 +73,13 @@ This RPM contributes the navigation bars %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build perl createlinks @@ -95,12 +112,16 @@ echo "%doc COPYING f2b/*" >> %{name}-%{v %clean rm -rf $RPM_BUILD_ROOT -%pre - %preun -if [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] +# complete remove +if [ $1 == 0 ] then - unlink %{dir_mngr}/themes/default/public/js/jquery.min.js + systemctl stop smanager.service + rm -f /home/e-smith/db/navigation2/* + rm -f /home/e-smith/db/routes + rm -f %{dir_mngr}/themes/default/public/css/* + rm -rf %{dir_mngr}/themes/default/public/js + find %{dir_mngr}/lib/SrvMngr/I18N/Modules -type f -name '*.pm' -exec rm '{}' \; fi true @@ -111,16 +132,47 @@ then mkdir %{dir_mngr}/themes/default/public/js [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] || ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js + [ -h %{dir_mngr}/themes/default/public/js/jquery.min.map ] || + ln -s /usr/share/javascript/jquery/latest/jquery.min.map %{dir_mngr}/themes/default/public/js/jquery.min.map fi true -%postun - %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) %changelog -* Mon Jan 03 2022 Michel Begue 0.1.4-11.sme +* Tue Apr 25 2023 Michel Begue 0.1.4-20.sme +- general locales for awstats [SME:12324b] +- fix reconfigure asked when not needed [SME: 12171b] +- remove unSafe status from session data + +* Wed Dec 28 2022 Brian Read 0.1.4-19.sme +- Fix requires in systemd smanager.server file [SME:12294] + +* Fri Dec 09 2022 Brian Read 0.1.4-18.sme +- Fix up typo in datetime processing [SME: 11827] + +* Mon Jul 18 2022 Michel Begue 0.1.4-17.sme +- add forgotten password link to login panel [SME: 11816] +- update to httpd 2.4 syntax [SME: 12112] +- enable backup of /usr/share/smanager/data +- fix target in link to 'Previous SM' + +* Sun Jul 17 2022 Jean-Philippe Pialasse 0.1.4-16.sme +- untainting datetime [SME: 12111] + +* Sun Jul 17 2022 Jean-Philippe Pialasse 0.1.4-15.sme +- untainting printer [SME: 12110] + +* Fri Jan 21 2022 Michel Begue 0.1.4-14.sme +- Fix jquery map link missing +- Fix jquery link deleted during update +- Remove generated file during remove + +* Wed Jan 05 2022 Brian Read 0.1.4-13.sme +- Update-format-for-datetime-and-reboot [SME: 11830] + +* Mon Jan 03 2022 Michel Begue 0.1.4-12.sme - Add show password icon to login panel (requires jquery) - Extend toggle hide to section menu (requires jquery) - Set layout according to jquery presence