rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use systemd script unconditionally (#850149)

Browse Source 
Resolves: rhbz#850149
This commit is contained in:
Joe Orton 2012-10-01 11:38:56 +01:00
parent 97d1d1ca36
commit e3b60d787d
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.3 Version: 2.4.3
Release: 7%{?dist} Release: 8%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -398,33 +398,13 @@ rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}
-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || : -s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
%post %post
%if 0%{?systemd_post:1}
%systemd_post httpd.service %systemd_post httpd.service
%else
# Register the httpd service
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%endif
%preun %preun
%if 0%{?systemd_preun:1}
%systemd_preun httpd.service %systemd_preun httpd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable httpd.service > /dev/null 2>&1 || :
/bin/systemctl stop httpd.service > /dev/null 2>&1 || :
fi
%endif
%postun %postun
%if 0%{?systemd_postun:1}
%systemd_postun %systemd_postun
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%endif
# Trigger for conversion from SysV, per guidelines at: # Trigger for conversion from SysV, per guidelines at:
# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd # https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
@ -595,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-8
- use systemd script unconditionally (#850149)
* Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-7 * Mon Oct 1 2012 Joe Orton <jorton@redhat.com> - 2.4.3-7
- use systemd scriptlets if available (#850149) - use systemd scriptlets if available (#850149)
- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists - don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists