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

use systemd scriptlets if available (#850149)

Browse Source 
- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists
Resolves: rhbz#850149
This commit is contained in:
Joe Orton 2012-10-01 10:40:54 +01:00
parent a62c50b2be
commit 2953eaec80
2 changed files with 22 additions and 5 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: 6%{?dist} Release: 7%{?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,21 +398,33 @@ 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
%else
# Register the httpd service # Register the httpd service
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
# Initial installation # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi fi
%endif
%preun %preun
%if 0%{?systemd_preun:1}
%systemd_preun httpd.service
%else
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
# Package removal, not upgrade # Package removal, not upgrade
/bin/systemctl --no-reload disable %{all_services} > /dev/null 2>&1 || : /bin/systemctl --no-reload disable httpd.service > /dev/null 2>&1 || :
/bin/systemctl stop %{all_services} > /dev/null 2>&1 || : /bin/systemctl stop httpd.service > /dev/null 2>&1 || :
fi fi
%endif
%postun %postun
%if 0%{?systemd_postun:1}
%systemd_postun
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /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
@ -426,7 +438,8 @@ fi
/sbin/chkconfig --del httpd >/dev/null 2>&1 || : /sbin/chkconfig --del httpd >/dev/null 2>&1 || :
%posttrans %posttrans
/bin/systemctl try-restart httpd.service >/dev/null 2>&1 || : test -f /etc/sysconfig/httpd-disable-posttrans || \
/bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :
%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
@ -582,6 +595,10 @@ 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-7
- use systemd scriptlets if available (#850149)
- don't run posttrans restart if /etc/sysconfig/httpd-disable-posttrans exists
* Mon Oct 01 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-6 * Mon Oct 01 2012 Jan Kaluza <jkaluza@redhat.com> - 2.4.3-6
- use systemctl from apachectl (#842736) - use systemctl from apachectl (#842736)

2
pullrev.sh
View File

@ -6,7 +6,7 @@ if [ $# -lt 1 ]; then
fi fi
repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk" repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
ver=2.4.2 ver=2.4.3
prefix="httpd-${ver}" prefix="httpd-${ver}"
suffix="r$1${2:++}" suffix="r$1${2:++}"
fn="${prefix}-${suffix}.patch" fn="${prefix}-${suffix}.patch"