--- rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2021/02/22 17:16:35	1.3
+++ rpms/smeserver-mailman/contribs10/smeserver-mailman.spec	2021/08/23 00:10:40	1.5
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.2 2021/02/22 17:02:30 jpp Exp $
+# $Id: smeserver-mailman.spec,v 1.4 2021/06/03 07:49:13 jpp 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 8
+%define release 10
 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
+* 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]
+
 * Mon Feb 22 2021 JP Pialasse <tests@pialasse.com> 1.5.0-8.sme
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
@@ -299,7 +306,7 @@ Add Mailman integration to the SME serve
 %setup
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 
 #/bin/rm -r root/opt/mailman
 
@@ -315,20 +322,15 @@ 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)
 rm -f e-smith-%{version}-filelist
 /sbin/e-smith/genfilelist \
-    --dir '/usr/lib/mailman' 'attr(02775,root,mailman)' \
-    --dir '/usr/lib/mailman/bin' 'attr(02775,root,mailman)' \
     --dir '/var/spool/mailman' 'attr(02775,root,mailman)' \
     --dir '/usr/lib/mailman/aliases' 'attr(02775,mailman,mailman)' \
     --file '/usr/lib/mailman/bin/post-install' 'attr(0755,root,mailman)' \
     --file '/usr/lib/mailman/bin/smelist' 'attr(04755,root,mailman)' \
-    --dir '/usr/lib/mailman/Mailman' 'attr(02775,root,mailman)' \
-    --dir '/usr/lib/mailman/Mailman/MTA' 'attr(02775,root,mailman)' \
     --file '/usr/lib/mailman/Mailman/MTA/SME.py' 'attr(02775,root,mailman)' \
     --dir  '/var/spool/mailman/qfiles' 'attr(02770,mailman,mailman)' \
     --dir  '/var/spool/mailman/qfiles/archive' 'attr(02770,mailman,mailman)' \
@@ -342,6 +344,13 @@ rm -f e-smith-%{version}-filelist
     --dir  '/var/spool/mailman/qfiles/virgin' 'attr(02770,mailman,mailman)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 
+sed -i -e '/\/usr\/lib\/mailman$/d ; /\/usr\/lib\/mailman\/bin$/d ; /\/usr\/lib\/mailman\/Mailman$/d ; /\/usr\/lib\/mailman\/Mailman\/MTA$/d ' %{name}-%{version}-filelist
+#those will conflict with mailman rpm on sme10
+#    --dir '/usr/lib/mailman' 'attr(02775,root,mailman)' \
+#    --dir '/usr/lib/mailman/bin' 'attr(02775,root,mailman)' \
+#   --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