From e13daed6a15dd41ff75ef9cb12697257777e45bb Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 5 Mar 2010 04:02:34 +0000
Subject: [PATCH] Update to binutils-2.20.1

---
 contrib/crossrpms/netbsd5.0.1/i386/Makefile.am    |  4 ++--
 .../netbsd5.0.1/i386/binutils-sources.add         |  4 ++--
 .../i386/i386-pc-netbsdelf5.0.1-binutils.spec     | 15 +++++----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am b/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am
index 29c3ec1272..52e6bf787d 100644
--- a/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am
+++ b/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am
@@ -10,9 +10,9 @@ EXTRA_DIST += libs.add
 EXTRA_DIST += target-libs.add
 include ../libs.am
 
-BINUTILS_VERS = 2.19.1
+BINUTILS_VERS = 2.20.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20090830.0
+BINUTILS_RPMREL = 0.20100305.1
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/netbsd5.0.1/i386/binutils-sources.add b/contrib/crossrpms/netbsd5.0.1/i386/binutils-sources.add
index e2be3cbb54..e458c6f5d7 100644
--- a/contrib/crossrpms/netbsd5.0.1/i386/binutils-sources.add
+++ b/contrib/crossrpms/netbsd5.0.1/i386/binutils-sources.add
@@ -1,2 +1,2 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2
-# Patch0:  ...
+Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+@PATCH0@
diff --git a/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-binutils.spec b/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-binutils.spec
index 46cefe7a26..411480dd07 100644
--- a/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-binutils.spec
+++ b/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-binutils.spec
@@ -30,15 +30,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.19.1
-%define binutils_version 2.19.1
-%define binutils_rpmvers %{expand:%(echo "2.19.1" | tr - _ )}
+%define binutils_pkgvers 2.20.1
+%define binutils_version 2.20.1
+%define binutils_rpmvers %{expand:%(echo "2.20.1" | tr - _ )}
 
 Name:		i386-pc-netbsdelf5.0.1-binutils
 Summary:	Binutils for target i386-pc-netbsdelf5.0.1
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	0.20090830.0%{?dist}
+Release:	0.20100305.1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,8 +56,7 @@ BuildRequires:	texinfo >= 4.2
 BuildRequires:	flex
 BuildRequires:	bison
 
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2
-# Patch0:  ...
+Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 
 %description
 Cross binutils for target i386-pc-netbsdelf5.0.1
@@ -70,10 +69,6 @@ cd binutils-%{binutils_pkgvers}
 cd ..
 
 %build
-%if "i386-pc-netbsdelf5.0.1" == "i686-pc-cygwin"
-# The cygwin sources are leaking memory
-  RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')"
-%endif
   mkdir -p build
   cd build
 %if "%{_build}" != "%{_host}"