From f3cbf4917693c065e678d5340d55d996e76cb6b8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 10 Mar 2009 13:50:32 +0000
Subject: [PATCH] - Switch to using upstream (GNU) binutils 2.19.1. It's
 exactly the same as     the MinGW version now.

---
 .cvsignore            |  2 +-
 mingw32-binutils.spec | 18 +++++++++---------
 sources               |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6aa2d31..57db3bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-binutils-2.19.1-mingw32-src.tar.gz
+binutils-2.19.1.tar.bz2
diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec
index 10ab1fe..5b369d2 100644
--- a/mingw32-binutils.spec
+++ b/mingw32-binutils.spec
@@ -1,16 +1,12 @@
-%define binutils_version 2.19.1
-#%define mingw32_binutils_version 20080109-2
-#%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} 
-
 Name:           mingw32-binutils
-Version:        %{binutils_version}
-Release:        3%{?dist}
+Version:        2.19.1
+Release:        4%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
-URL:            http://www.mingw.org/
-Source0:        http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-mingw32-src.tar.gz
+URL:            http://www.gnu.org/software/binutils/
+Source0:        http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -28,7 +24,7 @@ understand Windows executables and DLLs.
 
 
 %prep
-%setup -q -n binutils-%{binutils_version}
+%setup -q -n binutils-%{version}
 
 
 %build
@@ -74,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 10 2009 Richard W.M. Jones <rjones@redhat.com> - 2.19.1-4
+- Switch to using upstream (GNU) binutils 2.19.1.  It's exactly the
+  same as the MinGW version now.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.19.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 759eae7..452d8f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad3f2b5fdcd599a772ad75fec2c384d8  binutils-2.19.1-mingw32-src.tar.gz
+09a8c5821a2dfdbb20665bc0bd680791  binutils-2.19.1.tar.bz2