rpms/avr-binutils/devel binutils-2.17-makeinfo-version-check.patch, NONE, 1.1 avr-binutils.spec, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/avr-binutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30114

Modified Files:
	avr-binutils.spec 
Added Files:
	binutils-2.17-makeinfo-version-check.patch 
Log Message:
* Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.17-5
- Fix building with texinfo version > 4.9 (4.11 for example)


binutils-2.17-makeinfo-version-check.patch:

--- NEW FILE binutils-2.17-makeinfo-version-check.patch ---
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"


Index: avr-binutils.spec
===================================================================
RCS file: /cvs/extras/rpms/avr-binutils/devel/avr-binutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avr-binutils.spec	22 Aug 2007 13:46:48 -0000	1.4
+++ avr-binutils.spec	2 Dec 2007 16:11:31 -0000	1.5
@@ -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 @@
 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 @@
 %setup -q -c
 pushd binutils-%{version}
 %patch0 -p1 -z .open
+%patch1 -p1
 popd
 cp %{SOURCE1} .
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at 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 at hhs.nl> 2.17-4
 - Update License tag for new Licensing Guidelines compliance
 - Fix building with new glibc open checking