From d228fbbaabecea785858fcad1ca7cc812079c80d97f4068a96024386e257ab9f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 25 Nov 2014 07:59:25 +0000 Subject: [PATCH] Accepting request 260307 from home:Ledest:misc fix bashisms in pre script OBS-URL: https://build.opensuse.org/request/show/260307 OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot?expand=0&rev=7 --- dovecot.changes | 5 +++++ dovecot.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dovecot.changes b/dovecot.changes index a022d28..c077564 100644 --- a/dovecot.changes +++ b/dovecot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 08 04:46:00 UTC 2014 - Led + +- fix bashisms in pre script + ------------------------------------------------------------------- Thu Sep 18 14:22:32 UTC 2014 - mrueckert@suse.de diff --git a/dovecot.spec b/dovecot.spec index f7fe4a2..a3147d7 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} > 1230 %bcond_without systemd %else @@ -50,6 +51,7 @@ Source8: dovecot.service Source9: dovecot.socket Source10: dovecot-2.1-pigeonhole.configfiles Source11: dovecot-2.2-pigeonhole.configfiles + %description Dovecot is an IMAP and POP3 server for Linux and UNIX-like systems, written primarily with security in mind. Although it is written in C, @@ -96,11 +98,10 @@ install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/dovecot.socket %{buildroot}%{_var}/run/%{name}/login/ \ %{buildroot}%{_var}/lib/%{name}/ - %pre -/usr/sbin/groupadd -r %{name} &>/dev/null || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Dovecot imapd" -d %{_var}/run/%{name} %{name} &>/dev/null || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Dovecot login" -d %{_var}/run/%{name} dovenull &>/dev/null || : +/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : +/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Dovecot imapd" -d %{_var}/run/%{name} %{name} >/dev/null 2>&1 || : +/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Dovecot login" -d %{_var}/run/%{name} dovenull >/dev/null 2>&1 || : # try to copy the default configuration. # # we fail silently if the dovecot-implementation package is not