- more info alignments + fix for texinfo 7+, updated texinfo BR

diff --git a/binutils-info.patch b/binutils-info.patch
index 19ac2a768c60f7126e70b54c2cf7600338fda975..d660caa256a221972fb302f7c42c0134e12366a6 100644 (file)
--- a/binutils-info.patch
+++ b/binutils-info.patch
@@ -133,3 +133,42 @@ diff -urN binutils-2.24.51.0.4.org/ld/ld.texi binutils-2.24.51.0.4/ld/ld.texi
  @end direntry
  
  @titlepage
+--- binutils-2.40/libsframe/doc/sframe-spec.texi.orig  2023-01-14 01:00:00.000000000 +0100
++++ binutils-2.40/libsframe/doc/sframe-spec.texi       2023-04-09 13:11:37.982011188 +0200
+@@ -13,9 +13,9 @@ License''.
+ 
+ @end copying
+ 
+-@dircategory Software development
++@dircategory Programming tools:
+ @direntry
+-* SFrame: (sframe-spec).         The Simple Frame format.
++* SFrame: (sframe-spec).              The Simple Frame format
+ @end direntry
+ 
+ @titlepage
+--- binutils-2.40/gprofng/doc/gprofng.texi.orig        2023-01-14 01:00:00.000000000 +0100
++++ binutils-2.40/gprofng/doc/gprofng.texi     2023-04-09 13:12:26.545081432 +0200
+@@ -64,9 +64,9 @@ gprofng
+ 
+ @c -- Entry for the Info dir structure ----------------------------------------
+ @ifnottex
+-@dircategory Software development
++@dircategory Programming tools:
+ @direntry
+-* gprofng: (gprofng).                    The next generation profiling tool for Linux
++* gprofng: (gprofng).                 The next generation profiling tool for Linux
+ @end direntry
+ @end ifnottex
+ 
+--- binutils-2.40/libctf/configure.ac.orig     2023-01-14 01:00:00.000000000 +0100
++++ binutils-2.40/libctf/configure.ac  2023-04-09 13:39:22.069662722 +0200
+@@ -184,7 +184,7 @@ changequote(,)
+     # We require texinfo to be 6.3 or later, for a working synindex
+     # and validatemenus: otherwise we fall back to /bin/true.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
++       | grep -E 'texinfo[^0-9]*(6\.[3-9]|[7-9]\.)' >/dev/null 2>&1; then
+       build_info=yes
+     else
+         build_info=

diff --git a/binutils.spec b/binutils.spec
index 3a54b528b47ab3c5459edb7a90fc485647e37ccc..be8d24eacf8ad27f4e96a4ea3529a41175967861 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -66,7 +66,7 @@ BuildRequires:        rpmbuild(macros) >= 1.527
 BuildRequires: sparc32
 %endif
 BuildRequires: tar >= 1:1.22
-BuildRequires: texinfo >= 4.2
+BuildRequires: texinfo >= 6.3
 BuildRequires: zlib-devel
 %{?with_tests:BuildRequires:   zlib-static}
 BuildRequires: zstd-devel
@@ -74,7 +74,7 @@ BuildRequires:        zstd-devel
 Conflicts:     gcc-c++ < 5:3.3
 Conflicts:     modutils < 2.4.17
 Conflicts:     rpmbuild(macros) < 1.660
-Obsoletes:     binutils-gold
+Obsoletes:     binutils-gold < 3:2.21.51.0.7-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -184,6 +184,12 @@ for dir in gas bfd; do
        %{__autoconf}
        cd ..
 done
+cd libctf
+%{__aclocal} -I.. -I../config -I../bfd
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
 
 # More targets
 TARGETS=