diff options
| author | Todd Zullinger <tmz@pobox.com> | 2011-02-13 13:34:14 -0500 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2011-02-14 09:27:59 -0500 |
| commit | 94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3 (patch) | |
| tree | 34d1d6208cf93000f7f90f56ead65f817ef77289 | |
| parent | 8b78beb4c3bf81c4e2c9c818161461a724db18f3 (diff) | |
| download | git-package-94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3.tar.gz git-package-94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3.tar.xz git-package-94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3.zip | |
Clean up documentation settings (the defaults changed in 1.7.4)
Special settings for current Fedora and EL >= 6 are no longer
required. Adjust the settings for older EL releases.
| -rw-r--r-- | git.spec | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -259,17 +259,19 @@ prefix = %{_prefix} gitwebdir = %{_var}/www/git 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 echo gitexecdir = %{_bindir} >> config.mak %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 # packed-refs comes from a comment in contrib/hooks/update-paranoid cat << \EOF > %{name}-req @@ -474,6 +476,7 @@ rm -rf %{buildroot} %changelog * Sun Feb 13 2011 Todd Zullinger <tmz@pobox.com> - 1.7.4.1-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 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4-2 |