--- rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2021/06/03 07:49:13	1.4
+++ rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2022/03/15 18:15:59	1.6
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.3 2021/02/22 17:16:35 jpp Exp $
+# $Id: smeserver-mailman.spec,v 1.5 2021/08/23 00:10:40 terryfage Exp $
 # Authority: gordonr
 # Name: Gordon Rowell
 
@@ -9,7 +9,7 @@ Summary: Mailman configuration for SME s
 %define name smeserver-mailman
 Name: %{name}
 %define version 1.5.0
-%define release 9
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,11 +27,18 @@ Provides: e-smith-mailman
 AutoReqProv: no
 Patch0: smeserver-mailman-1.5.0.bz2411.Backup_mailman.patch
 Patch1: smeserver-mailman-1.5.0-locale-2016-03-09.patch
+Patch2: smeserver-mailman-1.5.0-locale-2021-08-22.patch
 
 %description
 Add Mailman integration to the SME server.
 
 %changelog
+* Tue Mar 15 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-11.sme
+- fix www line  should be after apache line in /etc/group [SME: 8056]
+
+* Mon Aug 23 2021 Terry Fage <terry.fage@gmail.com> 1.5.0-10.sme
+- apply locale 2021-08-22 patch
+
 * Thu Jun 03 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-9.sme
 - fix conflicting folders [SME: 11278]
 
@@ -302,7 +309,7 @@ Add Mailman integration to the SME serve
 %setup
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 
 #/bin/rm -r root/opt/mailman
 
@@ -318,7 +325,6 @@ do
     mkdir -p root/var/spool/mailman/qfiles/$dir
 done
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -348,7 +354,6 @@ sed -i -e '/\/usr\/lib\/mailman$/d ; /\/
 #   --dir '/usr/lib/mailman/Mailman' 'attr(02775,root,mailman)' \
 #  --dir '/usr/lib/mailman/Mailman/MTA' 'attr(02775,root,mailman)' \
 
-
 # SME10 to avoid error 
 #/usr/lib/rpm/brp-python-bytecompile
 # fix for unwanted listed compiled python files
@@ -371,11 +376,9 @@ rm -rf $RPM_BUILD_ROOT
     "Mailman user" /usr/lib/mailman /bin/false
 
 #mailman wants that the apache group appears  before the www group in /etc/group [SME: 8056]
-TEST=$(grep -P '^www|apache' /etc/group)
-TEST2='www:x:102:admin
-apache:x:102:'
-
-if [[ $TEST == $TEST2 ]]; then
+TEST=`egrep "^apache:" /etc/group -n| cut -f1 -d:`
+TEST2=`egrep "^www:" /etc/group -n| cut -f1 -d:`
+if [[ $TEST > $TEST2 ]]; then
     WWW=$(sed -n '/^www/p' /etc/group)
     sed -i '/^www/d' /etc/group
     echo $WWW >> /etc/group