From 40b2a9f9836f7db5dab9d9623872859764d3dc462ae0471c90f97ddfa3ae1a96 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 10 Nov 2014 10:08:27 +0000 Subject: [PATCH] Accepting request 260414 from home:Ledest:misc fix bashisms in post scripts OBS-URL: https://build.opensuse.org/request/show/260414 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=419 --- apache2.changes | 5 +++++ apache2.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apache2.changes b/apache2.changes index 88098d0..1af495b 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 09 00:57:00 UTC 2014 - Led + +- fix bashisms in post scripts + ------------------------------------------------------------------- Fri Nov 7 15:52:47 UTC 2014 - kstreitova@suse.com diff --git a/apache2.spec b/apache2.spec index 63ef586..5e40725 100644 --- a/apache2.spec +++ b/apache2.spec @@ -984,19 +984,19 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %if %prefork %post prefork -/usr/share/%{pname}/get_module_list &>/dev/null +/usr/share/%{pname}/get_module_list >/dev/null 2>&1 exit 0 %endif %if %worker %post worker -/usr/share/%{pname}/get_module_list &>/dev/null +/usr/share/%{pname}/get_module_list >/dev/null 2>&1 exit 0 %endif %if %event %post event -/usr/share/%{pname}/get_module_list &>/dev/null +/usr/share/%{pname}/get_module_list >/dev/null 2>&1 exit 0 %endif @@ -1009,7 +1009,7 @@ exit 0 %pre %if %{?suse_version:0}%{!?suse_version:1} # on Fedora, add the "apache" user -if ! /usr/bin/getent passwd %httpduser &>/dev/null; then +if ! /usr/bin/getent passwd %httpduser >/dev/null 2>&1; then echo "Creating %httpduser user" /usr/sbin/useradd -c "Apache" -u 48 \ -s /sbin/nologin -r -d %{localstatedir} %httpduser 2> /dev/null || : @@ -1089,7 +1089,7 @@ fi rm -rf $tmpdir /usr/share/%{pname}/apache-20-22-upgrade -/usr/share/%{pname}/get_module_list &>/dev/null +/usr/share/%{pname}/get_module_list >/dev/null 2>&1 %if 0%{?suse_version} >= 1210 %service_add_post apache2.service %endif