rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Improve el5 and el6 support (bug 1320210)

Browse Source 
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>
This commit is contained in:
Konrad Scherer 2016-03-22 11:59:59 -04:00 committed by Todd Zullinger
parent 185b89b8d4
commit 63f895c570
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git.spec
View File

@ -593,7 +593,9 @@ rm -rf %{buildroot}
%doc README Documentation/*.txt Documentation/RelNotes contrib/ %doc README Documentation/*.txt Documentation/RelNotes contrib/
%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
%{!?_without_docs: %doc Documentation/howto Documentation/technical} %{!?_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 %files p4
@ -614,7 +616,9 @@ rm -rf %{buildroot}
%files cvs %files cvs
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*git-cvs*.txt %doc Documentation/*git-cvs*.txt
%if "%{gitcoredir}" != "%{_bindir}"
%{_bindir}/git-cvsserver %{_bindir}/git-cvsserver
%endif
%{gitcoredir}/*cvs* %{gitcoredir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html } %{!?_without_docs: %doc Documentation/*git-cvs*.html }
@ -693,6 +697,11 @@ rm -rf %{buildroot}
# No files for you! # No files for you!
%changelog %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> * Tue Mar 22 2016 Todd Zullinger <tmz@pobox.com>
- Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) - Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210)