--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2021/06/21 15:09:42	1.48
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2021/12/26 16:23:40	1.55
@@ -1,15 +1,23 @@
-# $Id: smeserver-manager.spec,v 1.46 2021/06/15 08:56:45 michel Exp $
+# $Id: smeserver-manager.spec,v 1.54 2021/12/26 15:33:49 brianr Exp $
 
 Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.4
-%define release 1
+%define release 8
 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
+Patch2: smeserver-manager-0.1.4-Add-dummy-classes-to-ep-files.patch
+Patch3: smeserver-manager-0.1.4-Add-span-to-group-member-checkbox-list.patch
+Patch4: smeserver-manager-0.1.4-Review-configuration-Virtual-domains-re-format-html.patch
+Patch5: smeserver-manager-0.1.4-Sort-out-responsive-table-in-user-and-host-lists.patch
+Patch6: smeserver-manager-0.1.4-fix-translation-strings-with-prefix-for-review-config.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -41,6 +49,13 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -74,7 +89,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
@@ -83,8 +98,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
 
@@ -94,6 +111,33 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-8.sme
+- fix-translation-strings-with-prefix-for-review-config [SME: 11823]
+
+* Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-7.sme
+- Sort-out-responsive-table-in-user-and-host-lists [SME: 11824]
+
+* Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-6.sme
+- e-format html for Vistual domains inReview config to be compatible with email format list [SME 11822]
+
+* Mon Dec 20 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-5.sme
+- Add-span-to-group-member-checkbox-list [SME: 11815]
+
+* Mon Nov 29 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-4.sme
+- Add-dummy-classes-to-ep-files.patch [SME: 11780]
+
+* Mon Nov 15 2021 Michel Begue <mab974@misouk.com> 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 <mab974@protonmail.com> 0.1.4-2.sme
+- Fix incorrect list order (users, ibays, ...)
+- Add external private access (remote management)
+- Change CSRF error message
+
 * Mon Jun 21 2021 Michel Begue <mab974@gmail.com> 0.1.4-1.sme
 - New version: smeserver-manager-0.1.4-1 (= 0.1.2-13)