From 63f895c570bcd06e328d3d4f916cbff4cd00b08e Mon Sep 17 00:00:00 2001 From: Konrad Scherer Date: Tue, 22 Mar 2016 11:59:59 -0400 Subject: [PATCH] Improve el5 and el6 support (bug 1320210) Workaround missing git subtree documentation in prebuilt docs, dropping a redundant listing of Documentation/docbook-xsl.css, Only add git-cvsserver binary once if the core dir matches the bin dir as it does on el5. Signed-off-by: Konrad Scherer --- git.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ce99e26..9313a1b 100644 --- a/git.spec +++ b/git.spec @@ -593,7 +593,9 @@ rm -rf %{buildroot} %doc README Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{!?_without_docs: %doc contrib/subtree/git-subtree.html Documentation/docbook-xsl.css} +%if ! %{use_prebuilt_docs} +%{!?_without_docs: %doc contrib/subtree/git-subtree.html} +%endif %files p4 @@ -614,7 +616,9 @@ rm -rf %{buildroot} %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt +%if "%{gitcoredir}" != "%{_bindir}" %{_bindir}/git-cvsserver +%endif %{gitcoredir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } @@ -693,6 +697,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 22 2016 Konrad Scherer +- Workaround missing git subtree documentation in prebuilt docs (bug 1320210) +- Only add git-cvsserver binary once if the core dir matches the bin dir as it + does on el5 (bug 1320210) + * Tue Mar 22 2016 Todd Zullinger - Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210)