From c7b13685eb250a4ce9ae87d5baf41ac85363fd79 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Fri, 20 Sep 2013 16:36:40 +0200
Subject: [PATCH] Update to 3.0.0

and enable support for winpthreads on Fedora 20+
---
 .gitignore         |  1 +
 mingw-headers.spec | 21 +++++++++++++++------
 sources            |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1535758..52b3b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /mingw-w64-code-6258-trunk.zip
 /mingw-w64-code-6277-trunk.zip
 /mingw-w64-code-6284-trunk.zip
+/mingw-w64-v3.0.0.tar.bz2
diff --git a/mingw-headers.spec b/mingw-headers.spec
index a9fb7dc..3d21043 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -1,6 +1,6 @@
-%global snapshot_date 20130914
-%global snapshot_rev 6284
-%global branch trunk
+#%%global snapshot_date 20130914
+#%%global snapshot_rev 6284
+#%%global branch trunk
 
 # The mingw-w64-headers provide the headers pthread_time.h
 # and pthread_unistd.h by default and are dummy headers.
@@ -10,11 +10,16 @@
 # the flag below needs to be set to 1. When winpthreads is
 # available then this flag needs to be set to 0 to avoid
 # a file conflict with the winpthreads headers
+# Winpthreads is available as of Fedora 20
+%if %{?fedora} >= 20
+%global bundle_dummy_pthread_headers 0
+%else
 %global bundle_dummy_pthread_headers 1
+%endif
 
 Name:           mingw-headers
-Version:        2.0.999
-Release:        0.38.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Win32/Win64 header files
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
@@ -29,7 +34,7 @@ URL:            http://mingw-w64.sourceforge.net/
 # spectool -g mingw-headers.spec
 Source0:        http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip
 %else
-Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
 %endif
 
 BuildArch:      noarch
@@ -110,6 +115,10 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Fri Sep 20 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0
+- Enable support for winpthreads (F20+)
+
 * Sat Sep 14 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.38.trunk.r6284.20130914
 - Update to r6284 (20130914 snapshot)
 - Fixes 'VARIANT' has no member named 'bstrVal' errors (mingw-tk)
diff --git a/sources b/sources
index 78238a5..1b159d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b928a44a082d147ce74b255a5334bd1b  mingw-w64-code-6284-trunk.zip
+22b0030702fe00927daf1ae6ddfb526e  mingw-w64-v3.0.0.tar.bz2