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

Clean up documentation settings (the defaults changed in 1.7.4)

Browse Source 
Special settings for current Fedora and EL >= 6 are no longer
required.  Adjust the settings for older EL releases.
This commit is contained in:
Todd Zullinger 2011-02-13 13:34:14 -05:00
parent 8b78beb4c3
commit 94ce6ac2e5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git.spec
View File

@ -259,17 +259,19 @@ prefix = %{_prefix}
gitwebdir = %{_var}/www/git gitwebdir = %{_var}/www/git
EOF EOF
%if 0%{?fedora} || 0%{?rhel} >= 6
cat << \EOF >> config.mak
ASCIIDOC8 = 1
ASCIIDOC_NO_ROFF = 1
EOF
%endif
%if 0%{?rhel} && 0%{?rhel} <= 5 %if 0%{?rhel} && 0%{?rhel} <= 5
echo gitexecdir = %{_bindir} >> config.mak echo gitexecdir = %{_bindir} >> config.mak
%endif %endif
%if 0%{?rhel} && 0%{?rhel} == 5
# This is needed for 1.69.1-1.71.0
echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak
%endif
%if 0%{?rhel} && 0%{?rhel} <= 4
echo ASCIIDOC7 = 1 >> config.mak
%endif
# Filter bogus perl requires # Filter bogus perl requires
# packed-refs comes from a comment in contrib/hooks/update-paranoid # packed-refs comes from a comment in contrib/hooks/update-paranoid
cat << \EOF > %{name}-req cat << \EOF > %{name}-req
@ -474,6 +476,7 @@ rm -rf %{buildroot}
%changelog %changelog
* Sun Feb 13 2011 Todd Zullinger <tmz@pobox.com> - 1.7.4.1-1 * Sun Feb 13 2011 Todd Zullinger <tmz@pobox.com> - 1.7.4.1-1
- Update to 1.7.4.1 - Update to 1.7.4.1
- Clean up documentation settings (the defaults changed in 1.7.4)
- Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing - Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4-2 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4-2