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

move unit man pages to section 8, add as Documentation= in units

Browse Source
This commit is contained in:
Joe Orton 2017-06-05 16:55:45 +01:00
parent 6fd8793087
commit fce414a1c1
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -24,5 +24,5 @@ x86_64
/httpd-2.4.18.tar.bz2 /httpd-2.4.18.tar.bz2
/httpd-2.4.23.tar.bz2 /httpd-2.4.23.tar.bz2
/httpd-2.4.25.tar.bz2 /httpd-2.4.25.tar.bz2
/httpd.socket.5 /httpd.socket.8
/httpd.service.5 /httpd.service.8

3
httpd.service
View File

@ -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 # Modifying this file in-place is not recommended, because changes
# will be overwritten during package upgrades. If you want to # will be overwritten during package upgrades. If you want to
@ -15,6 +15,7 @@
[Unit] [Unit]
Description=The Apache HTTP Server Description=The Apache HTTP Server
After=network.target remote-fs.target nss-lookup.target After=network.target remote-fs.target nss-lookup.target
Documentation=man:httpd.service(8)
[Service] [Service]
Type=notify Type=notify

2
httpd.service.xml
View File

@ -31,7 +31,7 @@
<refmeta> <refmeta>
<refentrytitle>httpd.service</refentrytitle> <refentrytitle>httpd.service</refentrytitle>
<manvolnum>5</manvolnum> <manvolnum>8</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>

3
httpd.socket
View File

@ -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] [Unit]
Description=Apache httpd Server Socket Description=Apache httpd Server Socket
Documentation=man:httpd.socket(8)
[Socket] [Socket]
ListenStream=80 ListenStream=80

11
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.25 Version: 2.4.25
Release: 9%{?dist} Release: 10%{?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
@ -439,9 +439,8 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
$RPM_BUILD_ROOT/etc/logrotate.d/httpd $RPM_BUILD_ROOT/etc/logrotate.d/httpd
# Install systemd service man pages # Install systemd service man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 install -m 644 -p httpd.service.8 httpd.socket.8 \
install -m 644 -p httpd.service.5 httpd.socket.5 \ $RPM_BUILD_ROOT%{_mandir}/man8
$RPM_BUILD_ROOT%{_mandir}/man5
# fix man page paths # fix man page paths
sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \ 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 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
%{_mandir}/man8/* %{_mandir}/man8/*
%{_mandir}/man5/*
%{_unitdir}/*.service %{_unitdir}/*.service
%{_unitdir}/*.socket %{_unitdir}/*.socket
@ -700,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %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 * Fri May 19 2017 Joe Orton <jorton@redhat.com> - 2.4.25-9
- add httpd.service(5) and httpd.socket(5) man pages - add httpd.service(5) and httpd.socket(5) man pages