--- rpms/smeserver-mailman/contribs9/smeserver-mailman.spec	2015/08/21 17:20:19	1.3
+++ rpms/smeserver-mailman/contribs9/smeserver-mailman.spec	2016/03/09 08:39:06	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.10 2013/09/20 15:59:31 unnilennium Exp $
+# $Id: smeserver-mailman.spec,v 1.7 2015/09/11 15:05:17 stephdl 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 2
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,13 +25,26 @@ BuildRequires: e-smith-devtools >= 1.13.
 Obsoletes: e-smith-mailman
 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
 
 %description
 Add Mailman integration to the SME server.
 
 %changelog
-* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-2.sme
-- Initial release to contribs9
+* Wed Mar 09 2016 JP Pialasse <tests@pialasse.com> 1.5.0-7.sme
+- apply locale 2016-03-09 patch
+
+* Fri Sep 11 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-6.sme
+- Mailman is now added to the backup/restore process [SME: 2411]
+- Added smeserver-mailman-1.5.0.bz2411.Backup_mailman.patch
+
+* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-5.sme
+- mailman wants that the group apache appears before the www group in /etc/group
+- script added in %pre to change that order. [SME: 8056]
+
+* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-3.sme
+- Initial release to contribs9 [SME: 8453]
 
 * Fri Jun 20 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-1.sme
 - Initial release to sme9
@@ -104,9 +117,6 @@ Add Mailman integration to the SME serve
 * Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-22
 - Apply 21 May 2008 locale patch
 - Fixed version number in previous changelog entry
-* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-2.sme
-- Initial release to contribs9
-
 
 * Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-21
 - Apply 5 May 2008 locale patch
@@ -120,9 +130,6 @@ Add Mailman integration to the SME serve
 * Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-18
 - Added 23 April 2008 locale patch
 - Fixed changelog
-* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-2.sme
-- Initial release to contribs9
-
 
 * Wed Apr 23 2008 Daniel B. <daniel@firewall-services.com> 1.3.0-17
 - Fix path for the archives [SME: 4252]
@@ -283,6 +290,9 @@ Add Mailman integration to the SME serve
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+
 
 #/bin/rm -r root/opt/mailman
 
@@ -356,6 +366,17 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/e-smith/create-system-user mailman 41 \
     "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
+    WWW=$(sed -n '/^www/p' /etc/group)
+    sed -i '/^www/d' /etc/group
+    echo $WWW >> /etc/group
+fi
+
 %post
 
 %preun