--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/10/10 20:51:32 1.49 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/11/15 18:03:45 1.50 @@ -1,16 +1,17 @@ -# $Id: smeserver-manager.spec,v 1.48 2021/06/21 15:09:42 michel Exp $ +# $Id: smeserver-manager.spec,v 1.49 2021/10/10 20:51:32 michel Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.4 -%define release 2 +%define release 3 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: %{name}-%{version}-list_access_csrf.patch +Patch1: %{name}-%{version}-review_csrf_url.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -43,6 +44,7 @@ This RPM contributes the navigation bars %prep %setup %patch0 -p1 +%patch1 -p1 %build perl createlinks @@ -76,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT %pre %preun -if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +if [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] then unlink %{dir_mngr}/themes/default/public/js/jquery.min.js fi @@ -85,8 +87,10 @@ true %post if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] 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 + [ -d %{dir_mngr}/themes/default/public/js ] || + 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 fi true @@ -96,6 +100,13 @@ true %defattr(-,root,root) %changelog +* Mon Nov 15 2021 Michel Begue 0.1.4-3.sme +- Fix error message when linking, unlinking jquery in spec +- Correct the 'review' panel presentation +- Modify CSRFDefender plugin to take into account GET method +- Add TOKEN param where the GET method is used in templates +- Remove smanager from local url address + * Mon Oct 11 2021 Michel Begue 0.1.4-2.sme - Fix incorrect list order (users, ibays, ...) - Add external private access (remote management)