From 530061ce99a36be8b050092907394f772b392d82 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 23 Feb 2019 11:51:12 -0500 Subject: [PATCH] Move gitweb manpages to gitweb package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The gitweb manpages should be installed with the gitweb package. This discrepancy was noted by Robert P. J. Day on the git list¹. ¹ https://public-inbox.org/git/alpine.LFD.2.21.1902230756280.24879@localhost.localdomain/ --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 209a561..50eeb22 100644 --- a/git.spec +++ b/git.spec @@ -630,7 +630,7 @@ rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn -exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|p4merge" +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -895,6 +895,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files -n gitweb %{_pkgdocdir}/*.gitweb %{_pkgdocdir}/gitweb*.txt +%{?with_docs:%{_mandir}/man1/gitweb.1*} +%{?with_docs:%{_mandir}/man5/gitweb.conf.5*} %{?with_docs:%{_pkgdocdir}/gitweb*.html} %config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} @@ -948,6 +950,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 +- Move gitweb manpages to gitweb package * Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 - Update to 2.21.0.rc2