rpms/ghdl/devel gcc41-makeinfo.patch,NONE,1.1 ghdl.spec,1.33,1.34

[Thomas M. Sailer (sailer)]

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9304

Modified Files:
	ghdl.spec 
Added Files:
	gcc41-makeinfo.patch 
Log Message:
fix configury to work with makeinfo >= 4.10


gcc41-makeinfo.patch:

--- NEW FILE gcc41-makeinfo.patch ---
--- gcc-4.1.1/configure.in.makeinfo	2007-10-09 17:06:27.000000000 +0200
+++ gcc-4.1.1/configure.in	2007-10-09 17:07:21.000000000 +0200
@@ -2128,7 +2128,7 @@
     # For an installed makeinfo, we require it to be from texinfo 4.2 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"
--- gcc-4.1.1/configure.makeinfo	2007-10-09 17:06:15.000000000 +0200
+++ gcc-4.1.1/configure	2007-10-09 17:07:41.000000000 +0200
@@ -3543,7 +3543,7 @@
     # For an installed makeinfo, we require it to be from texinfo 4.2 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ghdl.spec	8 Oct 2007 17:04:19 -0000	1.33
+++ ghdl.spec	9 Oct 2007 16:33:29 -0000	1.34
@@ -17,6 +17,7 @@
 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Patch100: ghdl-svn%{ghdlsvnver}.patch
 Patch101: ghdl-svn89-fix.patch
+Patch102: gcc41-makeinfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -114,6 +115,7 @@
 %patch101 -p0 -R -b .fix
 %{__mv} vhdl ../gcc/
 popd
+%patch102 -p1 -b .makeinfo
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -294,6 +296,7 @@
 %changelog
 * Mon Oct  8 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.6
 - ghdl-grt requires zlib-devel (rhbz 316311)
+- make it build with makeinfo >= 4.10
 
 * Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.5
 - excludearch ppc64