rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 87076 from home:fcrozat:branches:Apache

Browse Source 
- Ensure service_add_pre macro is correctly called for 
  openSUSE 12.1 or later.

OBS-URL: https://build.opensuse.org/request/show/87076
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=343
This commit is contained in:
Roman Drahtmueller 2011-10-07 15:06:00 +00:00 committed by Git OBS Bridge
parent 7027e60c26
commit 1796587345
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 7 14:36:31 UTC 2011 - fcrozat@suse.com
- Ensure service_add_pre macro is correctly called for
openSUSE 12.1 or later.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 27 08:19:35 UTC 2011 - fcrozat@suse.com Tue Sep 27 08:19:35 UTC 2011 - fcrozat@suse.com

7
apache2.spec
View File

@ -1012,19 +1012,18 @@ exit 0
# | | # | |
# #
# on Fedora, add the "apache" user
%if %{?suse_version:0}%{!?suse_version:1}
%pre %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; then
echo "Creating %httpduser user" echo "Creating %httpduser user"
/usr/sbin/useradd -c "Apache" -u 48 \ /usr/sbin/useradd -c "Apache" -u 48 \
-s /sbin/nologin -r -d %{localstatedir} %httpduser 2> /dev/null || : -s /sbin/nologin -r -d %{localstatedir} %httpduser 2> /dev/null || :
fi fi
%endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%service_add_pre apache2.service %service_add_pre apache2.service
%endif %endif
%endif
%preun %preun
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210