From e4137a931f0ae886109c39061e8841b12075d7e2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Dec 02 2007 16:11:31 +0000
Subject: - Fix building with texinfo version > 4.9 (4.11 for example)


---

diff --git a/avr-binutils.spec b/avr-binutils.spec
index 73344db..531f315 100644
--- a/avr-binutils.spec
+++ b/avr-binutils.spec
@@ -2,7 +2,7 @@
 
 Name:           %{target}-binutils
 Version:        2.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Cross Compiling GNU binutils targeted at %{target}
 Group:          Development/Tools
 License:        GPLv2+
@@ -10,6 +10,7 @@ URL:            http://www.gnu.org/software/binutils/
 Source0:        ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{version}.tar.bz2
 Source1:        README.fedora
 Patch0:         binutils-2.16.1-open.patch
+Patch1:         binutils-2.17-makeinfo-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  gawk texinfo
 
@@ -23,6 +24,7 @@ native %{_arch} platform.
 %setup -q -c
 pushd binutils-%{version}
 %patch0 -p1 -z .open
+%patch1 -p1
 popd
 cp %{SOURCE1} .
 
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 2.17-5
+- Fix building with texinfo version > 4.9 (4.11 for example)
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 2.17-4
 - Update License tag for new Licensing Guidelines compliance
 - Fix building with new glibc open checking
diff --git a/binutils-2.17-makeinfo-version-check.patch b/binutils-2.17-makeinfo-version-check.patch
new file mode 100644
index 0000000..8445b60
--- /dev/null
+++ b/binutils-2.17-makeinfo-version-check.patch
@@ -0,0 +1,12 @@
+diff -up binutils-2.17/configure~ binutils-2.17/configure
+--- binutils-2.17/configure~	2007-12-02 16:56:59.000000000 +0100
++++ binutils-2.17/configure	2007-12-02 16:56:59.000000000 +0100
+@@ -3637,7 +3637,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4\.[1-3][0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"