From c433fa87b69d64b962ced97145087fc159807157 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Tue, 10 May 2011 23:03:19 +0300
Subject: [PATCH] Default to runtime pseudo reloc v2 now that mingw32-runtime
 3.18 is in

---
 mingw32-binutils-2.21-pseudo_reloc_v1.patch | 12 ------------
 mingw32-binutils.spec                       |  7 ++++---
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 mingw32-binutils-2.21-pseudo_reloc_v1.patch

diff --git a/mingw32-binutils-2.21-pseudo_reloc_v1.patch b/mingw32-binutils-2.21-pseudo_reloc_v1.patch
deleted file mode 100644
index 116d9c7..0000000
--- a/mingw32-binutils-2.21-pseudo_reloc_v1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1 binutils-2.21/ld/emultempl/pe.em
---- binutils-2.21/ld/emultempl/pe.em.pseudo_reloc_v1	2010-09-22 11:03:41.000000000 +0300
-+++ binutils-2.21/ld/emultempl/pe.em	2011-03-17 13:53:13.000000000 +0200
-@@ -100,7 +100,7 @@ fragment <<EOF
- #endif
- 
- #if defined(TARGET_IS_i386pe)
--#define DEFAULT_PSEUDO_RELOC_VERSION 2
-+#define DEFAULT_PSEUDO_RELOC_VERSION 1
- #else
- #define DEFAULT_PSEUDO_RELOC_VERSION 1
- #endif
diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec
index eff173e..250d444 100644
--- a/mingw32-binutils.spec
+++ b/mingw32-binutils.spec
@@ -1,13 +1,12 @@
 Name:           mingw32-binutils
 Version:        2.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
 URL:            http://www.gnu.org/software/binutils/
 Source0:        http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
-Patch0:         mingw32-binutils-2.21-pseudo_reloc_v1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -26,7 +25,6 @@ understand Windows executables and DLLs.
 
 %prep
 %setup -q -n binutils-%{version}
-%patch0 -p1 -b .pseudo_reloc_v1
 
 
 %build
@@ -72,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 10 2011 Kalev Lember <kalev@smartlink.ee> - 2.21-2
+- Default to runtime pseudo reloc v2 now that mingw32-runtime 3.18 is in
+
 * Thu Mar 17 2011 Kalev Lember <kalev@smartlink.ee> - 2.21-1
 - Update to 2.21
 - Added a patch to use runtime pseudo reloc v1 by default as the version of