diff options
| author | Joe Orton <jorton@redhat.com> | 2012-10-01 11:38:56 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2012-10-01 11:38:56 +0100 |
| commit | e3b60d787d13a6a27a0011ad7df984c1bc1f5692 (patch) | |
| tree | 3d593d8104fe0751fb634425556f1ed5e707c42c | |
| parent | 97d1d1ca3637dadd4fff90a87168e0f4df73b0a5 (diff) | |
| download | httpd-e3b60d787d13a6a27a0011ad7df984c1bc1f5692.tar.gz httpd-e3b60d787d13a6a27a0011ad7df984c1bc1f5692.tar.xz httpd-e3b60d787d13a6a27a0011ad7df984c1bc1f5692.zip | |
use systemd script unconditionally (#850149)
Resolves: rhbz#850149
| -rw-r--r-- | httpd.spec | 25 |
1 files changed, 4 insertions, 21 deletions
@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.3 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 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 || : %post -%if 0%{?systemd_post:1} %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 -%if 0%{?systemd_preun:1} %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 -%if 0%{?systemd_postun:1} %systemd_postun -%else -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -%endif # Trigger for conversion from SysV, per guidelines at: # https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd @@ -595,6 +575,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %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 - use systemd scriptlets if available (#850149) - don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists |