Rename httpd(8) manpage to avoid conflict.

This commit is contained in:
Jason Tibbitts 2017-01-09 19:06:08 -06:00
parent d6b93776b7
commit 1a5c4ef8af

View File

@ -1,6 +1,6 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.5.10 Version: 2.5.10
Release: 1%{?dist} Release: 2%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %define ssl_pem_file /etc/pki/%name/%name.pem
@ -267,6 +267,9 @@ mv %buildroot/%_mandir/man8/fetchnews.8 %buildroot/%_mandir/man8/cyrfetchnews.8
perl -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \ perl -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
%{buildroot}%{_mandir}/man8/cyrfetchnews.8 %{buildroot}%{_mandir}/man8/cyrfetchnews.8
# Rename 'httpd' manpage to avoid clash with Apache
mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/cyrhttpd.8
#remove executable bit from docs #remove executable bit from docs
for ddir in doc perl/imap/examples for ddir in doc perl/imap/examples
do do
@ -364,6 +367,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Mon Jan 09 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-2
- Rename httpd manpage to "cyrhttpd" to avoid conflict with the httpd package.
* Wed Nov 23 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-1 * Wed Nov 23 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-1
- Initial update to the 2.5 series. - Initial update to the 2.5 series.
- Significant spec cleanups. - Significant spec cleanups.