diff options
| author | Konrad Scherer <Konrad.Scherer@windriver.com> | 2016-03-22 11:59:59 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2016-03-27 16:09:09 -0400 |
| commit | 63f895c570bcd06e328d3d4f916cbff4cd00b08e (patch) | |
| tree | 216f3d6247c719d1196bae536acea28c07593f03 | |
| parent | 185b89b8d418351d8d810a4ddc38a70f6ecdcb6c (diff) | |
| download | git-package-63f895c570bcd06e328d3d4f916cbff4cd00b08e.tar.gz git-package-63f895c570bcd06e328d3d4f916cbff4cd00b08e.tar.xz git-package-63f895c570bcd06e328d3d4f916cbff4cd00b08e.zip | |
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 <Konrad.Scherer@windriver.com>
| -rw-r--r-- | git.spec | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -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 <Konrad.Scherer@windriver.com> +- 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 <tmz@pobox.com> - Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) |