Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	httpd.spec
@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.6 -Release: 1 +Release: 99IX URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -192,7 +192,7 @@ --includedir=%{_includedir}/httpd \ --libexecdir=%{_libdir}/httpd/modules \ --datadir=%{contentdir} \ - --enable-layout=Fedora \ + --enable-layout=CentOS \ --with-installbuilddir=%{_libdir}/httpd/build \ --enable-mpms-shared=all \ --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ @@ -377,32 +377,21 @@ # Register the httpd service if [ $1 -eq 1 ] ; then # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 \|\| : + chkconfig ${name} on >/dev/null 2>&1 \|\| : fi %preun if [ $1 -eq 0 ] ; then # Package removal, not upgrade - /bin/systemctl --no-reload disable %{all_services} > /dev/null 2>&1 \|\| : - /bin/systemctl stop %{all_services} > /dev/null 2>&1 \|\| : + chkconfig ${name} > /dev/null 2>&1 \|\| : fi %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 \|\| : - -# Trigger for conversion from SysV, per guidelines at: -# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd -%triggerun -- httpd < 2.2.21-5 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -#/usr/bin/systemd-sysv-convert --save httpd.service >/dev/null 2>&1 \|\|: - -# Run these because the SysV package being removed won't do them +service ${name} restart 2>&1 \|\| : /sbin/chkconfig --del httpd >/dev/null 2>&1 \|\| : %posttrans -/bin/systemctl try-restart httpd.service >/dev/null 2>&1 \|\| : +service ${name} restart 2>&1 \|\| : %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key