From 040ea18813b579c38c4d2f674013f98c84226705 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Apr 24 2015 13:25:53 +0000
Subject: Update to 4.0.2 and backport fix for RHBZ #1213843


---

diff --git a/.gitignore b/.gitignore
index ea043ff..e5e3927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
 /mingw-w64-v4.0-rc3.tar.bz2
 /mingw-w64-v4.0.0.tar.bz2
 /mingw-w64-v4.0.1.tar.bz2
+/mingw-w64-v4.0.2.tar.bz2
diff --git a/commit-6c56d0b b/commit-6c56d0b
new file mode 100644
index 0000000..1017d69
--- /dev/null
+++ b/commit-6c56d0b
@@ -0,0 +1,23 @@
+commit 6c56d0b0eb5be9fbeb552ba070a2304b842a5102
+Author: Руслан Ижбулатов <lrn1986@gmail.com>
+Date:   Wed Mar 18 14:06:33 2015 +0000
+
+    Add more includes to shlobj.h
+    
+    wtypesbase.h and wincrypt.h pull some other headers,
+    together they all provide EXTERN_C, DECLSPEC_IMPORT and WINAPI macros,
+    which are needed by shlobj.h directly or indirectly.
+
+diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
+index 3d2e21c..be087c4 100644
+--- a/mingw-w64-headers/include/shlobj.h
++++ b/mingw-w64-headers/include/shlobj.h
+@@ -6,6 +6,8 @@
+ #ifndef _SHLOBJ_H_
+ #define _SHLOBJ_H_
+ 
++#include <wtypesbase.h>
++#include <wincrypt.h>
+ #include <winapifamily.h>
+ 
+ #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT)
diff --git a/mingw-headers.spec b/mingw-headers.spec
index 19382ed..a24d678 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -21,7 +21,7 @@
 %endif
 
 Name:           mingw-headers
-Version:        4.0.1
+Version:        4.0.2
 Release:        1%{?dist}
 Summary:        Win32/Win64 header files
 
@@ -46,6 +46,9 @@ Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}
 # happening as the .idl files shouldn't be used by default
 Patch0:         mingw-headers-no-widl.patch
 
+# Backport fix for https://bugzilla.redhat.com/show_bug.cgi?id=1213843
+Patch1:         commit-6c56d0b
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -92,6 +95,7 @@ unzip %{S:0}
 %endif
 
 %patch0 -p0 -b .idl
+%patch1 -p1
 
 
 %build
@@ -126,6 +130,10 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Fri Apr 24 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.0.2-1
+- Update to 4.0.2
+- Backport fix for shlobj.h regression (RHBZ #1213843)
+
 * Sun Mar 29 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 4.0.1-1
 - Update to 4.0.1
 
diff --git a/sources b/sources
index f28a120..2496717 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-574b6cc285bddf32dc075cd13f07a57c  mingw-w64-v4.0.1.tar.bz2
+bb6404499342e02447b7c49f47b06b5e  mingw-w64-v4.0.2.tar.bz2