From c13069e1facb880b911cbb75798d9dfec95d61e5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 Jul 2017 19:13:10 -0400 Subject: [PATCH] Leave git-subtree.html in %_pkgdocdir to avoid broken links The link to git.html in git-subtree.html expects to find git.html in the main docdir. Shipping git-subtree.html in contrib/subtree breaks this link. --- git.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b0adf30..65ae437 100644 --- a/git.spec +++ b/git.spec @@ -532,9 +532,6 @@ make -C contrib/subtree install %if ! %{use_prebuilt_docs} make -C contrib/subtree install-doc %endif -# it's ugly hack, but this file don't need to be copied to this directory -# it's already part of git-core-doc and it's alone here -rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/git-subtree.html mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -549,7 +546,7 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' rm -rf contrib/credential # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir -rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,sh,txt,xml}},t} +rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';'