Backport S390 .machinemode pseudo op and add pod2man build requirement

1 files changed, 10 insertions, 1 deletions

diff --git a/cross-binutils.spec b/cross-binutils.spec
index 729fbe3..4be0a57 100644
--- a/cross-binutils.spec
+++ b/cross-binutils.spec
@@ -55,7 +55,7 @@ Name: %{cross}-binutils
 # instead we create a bogus, higher, version number here.  Once the next
 # official binutils release happens (2.24.0) we will be able to restore
 # Version to an honest value and everything will be good again.
-Version: 2.23.88.0.1
+Version: 2.23.88.0.2
 %define srcdir binutils-2.23.2
 Release: 1%{?dist}
 License: GPLv3+
@@ -100,9 +100,13 @@ Patch17: binutils-2.23.2-bfd-texinfo-fixes.patch
 Patch18: binutils-2.23.2-dwz-alt-debuginfo.patch
 # Correct bug introduced by patch 16
 Patch19: binutils-2.23.2-aarch64-em.patch
+# Add support for the .machinemode pseudo-op to the S/390 assembler.
+patch20: binutils-2.23.2-s390-gas-machinemode.patch
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel
+# BZ 920545: We need pod2man in order to build the manual pages.
+BuildRequires: /usr/bin/pod2man
 # Required for: ld-bootstrap/bootstrap.exp bootstrap with --static
 # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
 Conflicts: gcc-c++ < 4.0.0
@@ -227,6 +231,7 @@ cd %{srcdir}
 %patch17 -p0 -b .bfd-texinfo~
 %patch18 -p0 -b .dwz~
 %patch19 -p0 -b .aarch64~
+%patch20 -p0 -b .machinemode~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -665,6 +670,10 @@ rm -rf %{buildroot}
 %do_files xtensa-linux-gnu	%{build_xtensa}
 
 %changelog
+* Thu Aug 8 2013 David Howells <dhowells@redhat.com> - 2.23.88.0.1-2
+- Backport S390 .machinemode pseudo-op support from binutils-2.23.88.0.1-10.
+- Add pod2man as a build requirement.
+
 * Tue Jun 4 2013 David Howells <dhowells@redhat.com> - 2.23.88.0.1-1
 - Update to binutils-2.22.88.0.1 to fix F19 texinfo issues [BZ 912921].