Update asciidoc requirements, drop unsupported ASCIIDOC7
Since git-1.7.12, asciidoc >= 8.4.1 is a requirement to build the documentation. Update the build requires to reflect this. Note that this means that EL-5 can no longer build documentation as asciidoc-8.1.0 is the latest in EPEL. (It might be worth adding support for using the prebuilt documentation files to enable EL-5 builds to continue working.)
This commit is contained in:
parent
166c9f33c3
commit
e313d827cc
19
git.spec
19
git.spec
@ -54,14 +54,6 @@
|
||||
%global use_desktop_vendor 1
|
||||
%endif
|
||||
|
||||
# Use asciidoc-7 on EL <= 4. Again, we don't support EL-4, but no need to make
|
||||
# it more difficult to build a modern git there.
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 4
|
||||
%global asciidoc7 1
|
||||
%else
|
||||
%global asciidoc7 0
|
||||
%endif
|
||||
|
||||
# Only build git-arch for Fedora < 16, where tla is available
|
||||
%if 0%{?fedora} && 0%{?fedora} < 16
|
||||
%global arch_support 1
|
||||
@ -78,7 +70,7 @@
|
||||
|
||||
Name: git
|
||||
Version: 1.8.1.4
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Fast Version Control System
|
||||
License: GPLv2
|
||||
Group: Development/Tools
|
||||
@ -108,7 +100,7 @@ BuildRequires: gettext
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: zlib-devel >= 1.2
|
||||
%{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto}
|
||||
%{!?_without_docs:BuildRequires: asciidoc >= 8.4.1, xmlto}
|
||||
%if %{gnome_keyring}
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
%endif
|
||||
@ -353,10 +345,6 @@ echo gitexecdir = %{_bindir} >> config.mak
|
||||
echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak
|
||||
%endif
|
||||
|
||||
%if %{asciidoc7}
|
||||
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
|
||||
@ -606,6 +594,9 @@ rm -rf %{buildroot}
|
||||
# No files for you!
|
||||
|
||||
%changelog
|
||||
* Tue Feb 26 2013 Todd Zullinger <tmz@pobox.com> - 1.8.1.4-2
|
||||
- Update asciidoc requirements, drop unsupported ASCIIDOC7
|
||||
|
||||
* Wed Feb 20 2013 Adam Tkac <atkac redhat com> - 1.8.1.4-1
|
||||
- update to 1.8.1.4
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user