diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | httpd.service | 3 | ||||
| -rw-r--r-- | httpd.service.xml | 2 | ||||
| -rw-r--r-- | httpd.socket | 3 | ||||
| -rw-r--r-- | httpd.spec | 11 |
5 files changed, 13 insertions, 10 deletions
@@ -24,5 +24,5 @@ x86_64 /httpd-2.4.18.tar.bz2 /httpd-2.4.23.tar.bz2 /httpd-2.4.25.tar.bz2 -/httpd.socket.5 -/httpd.service.5 +/httpd.socket.8 +/httpd.service.8 diff --git a/httpd.service b/httpd.service index 5875d9c..1f707e8 100644 --- a/httpd.service +++ b/httpd.service @@ -1,4 +1,4 @@ -# See httpd.service(5) for more information on using the httpd service. +# See httpd.service(8) for more information on using the httpd service. # Modifying this file in-place is not recommended, because changes # will be overwritten during package upgrades. If you want to @@ -15,6 +15,7 @@ [Unit] Description=The Apache HTTP Server After=network.target remote-fs.target nss-lookup.target +Documentation=man:httpd.service(8) [Service] Type=notify diff --git a/httpd.service.xml b/httpd.service.xml index 807b69c..d03e133 100644 --- a/httpd.service.xml +++ b/httpd.service.xml @@ -31,7 +31,7 @@ <refmeta> <refentrytitle>httpd.service</refentrytitle> - <manvolnum>5</manvolnum> + <manvolnum>8</manvolnum> </refmeta> <refnamediv> diff --git a/httpd.socket b/httpd.socket index a75779c..074695e 100644 --- a/httpd.socket +++ b/httpd.socket @@ -1,7 +1,8 @@ -# See httpd.socket(5) for more information on using the httpd service. +# See httpd.socket(8) for more information on using the httpd service. [Unit] Description=Apache httpd Server Socket +Documentation=man:httpd.socket(8) [Socket] ListenStream=80 @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.25 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -439,9 +439,8 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \ $RPM_BUILD_ROOT/etc/logrotate.d/httpd # Install systemd service man pages -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 -install -m 644 -p httpd.service.5 httpd.socket.5 \ - $RPM_BUILD_ROOT%{_mandir}/man5 +install -m 644 -p httpd.service.8 httpd.socket.8 \ + $RPM_BUILD_ROOT%{_mandir}/man8 # fix man page paths sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \ @@ -633,7 +632,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy %{_mandir}/man8/* -%{_mandir}/man5/* %{_unitdir}/*.service %{_unitdir}/*.socket @@ -700,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Mon Jun 5 2017 Joe Orton <jorton@redhat.com> - 2.4.25-10 +- move unit man pages to section 8, add as Documentation= in units + * Fri May 19 2017 Joe Orton <jorton@redhat.com> - 2.4.25-9 - add httpd.service(5) and httpd.socket(5) man pages |