diff --git a/binutils-rh797752.patch b/binutils-rh797752.patch new file mode 100644 index 0000000..5bce352 --- /dev/null +++ b/binutils-rh797752.patch @@ -0,0 +1,15 @@ +diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi +index 698702b..1d429cf 100644 +--- a/binutils/doc/binutils.texi ++++ b/binutils/doc/binutils.texi +@@ -2866,8 +2866,8 @@ the Info entries for @file{binutils}. + + @smallexample + @c man begin SYNOPSIS cxxfilt +-c++filt [@option{-_}|@option{--strip-underscores}] +- [@option{-n}|@option{--no-strip-underscores}] ++c++filt [@option{-_}|@option{--strip-underscore}] ++ [@option{-n}|@option{--no-strip-underscore}] + [@option{-p}|@option{--no-params}] + [@option{-t}|@option{--types}] + [@option{-i}|@option{--no-verbose}] diff --git a/binutils.spec b/binutils.spec index c401669..6a12ac2 100644 --- a/binutils.spec +++ b/binutils.spec @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.22.52.0.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -39,6 +39,8 @@ Patch07: binutils-2.20.51.0.10-sec-merge-emit.patch Patch08: binutils-2.22.52.0.1-weakdef.patch # From upstream, fixes ld/13621 bug 'dangling global hidden symbol in symtab' Patch09: binutils-2.22.52.0.1-ld-13621.patch +# From upstream +Patch10: binutils-rh797752.patch %define gold_arches %ix86 x86_64 @@ -138,6 +140,7 @@ using libelf instead of BFD. %patch07 -p0 -b .sec-merge-emit~ %patch08 -p1 -b .weakdef~ %patch09 -p1 -b .ld-13621~ +%patch10 -p1 -b .cxxfilt-docs~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -432,6 +435,9 @@ exit 0 %endif # %{isnative} %changelog +* Mon Feb 27 2012 Jeff Law - 2.22.52.0.1-6 +- Fix c++filt docs (#797752) + * Wed Feb 14 2012 Mark Wielaard - 2.22.52.0.1-5 - Add upstream ld/13621 'dangling global hidden symbol in symtab' patch.