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
This commit is contained in:
Kristyna Streitova 2014-11-10 10:08:27 +00:00 committed by Git OBS Bridge
parent 951efc68a1
commit 40b2a9f983
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 09 00:57:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashisms in post scripts
-------------------------------------------------------------------
Fri Nov 7 15:52:47 UTC 2014 - kstreitova@suse.com

View File

@ -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