--- rpms/smeserver-mailman/contribs10/smeserver-mailman.spec 2021/08/23 00:10:40 1.5 +++ rpms/smeserver-mailman/contribs10/smeserver-mailman.spec 2022/04/10 20:18:28 1.7 @@ -1,4 +1,4 @@ -# $Id: smeserver-mailman.spec,v 1.4 2021/06/03 07:49:13 jpp Exp $ +# $Id: smeserver-mailman.spec,v 1.6 2022/03/15 18:15:59 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 10 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -28,11 +28,19 @@ 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 +Patch3: smeserver-mailman-1.5.0-bz11278-systemd.patch %description Add Mailman integration to the SME server. %changelog +* Sun Apr 10 2022 Jean-Philippe Pialasse 1.5.0-12.sme +- fix missing service start [SME: 11278] + add update event + +* Tue Mar 15 2022 Jean-Philippe Pialasse 1.5.0-11.sme +- fix www line should be after apache line in /etc/group [SME: 8056] + * Mon Aug 23 2021 Terry Fage 1.5.0-10.sme - apply locale 2021-08-22 patch @@ -307,6 +315,7 @@ Add Mailman integration to the SME serve %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 #/bin/rm -r root/opt/mailman @@ -373,11 +382,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