From 7a205d6ec43b822f3b78316e6e6c8073367bf2f3 Mon Sep 17 00:00:00 2001
From: zhiyi <zhiyi@iscas.ac.cn>
Date: Thu, 12 Nov 2020 17:20:34 +0800
Subject: [PATCH] Set bundle_dummy_pthread_headers to 0

---
 mingw-headers.spec | 45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/mingw-headers.spec b/mingw-headers.spec
index 2da65b2..6e3d0d4 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -1,34 +1,13 @@
-#%%global snapshot_date 20160723
-#%%global snapshot_rev 65a0c3298db7cc5cbded63259663cb29e4780a56
-#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6)
-#%%global branch v5.x
-
-#%%global pre rc2
-
-%global bundle_dummy_pthread_headers 1
+%global bundle_dummy_pthread_headers 0
 
 Name:           mingw-headers
 Version:        6.0.0
-Release:        4%{?dist}
+Release:        5
 Summary:        Win32/Win64 header files
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
 URL:            http://mingw-w64.sourceforge.net/
-%if 0%{?snapshot_date}
-# To regenerate a snapshot:
-# Use your regular webbrowser to open https://sourceforge.net/p/mingw-w64/mingw-w64/ci/%{snapshot_rev}/tarball
-# This triggers the SourceForge instructure to generate a snapshot
-# After that you can pull in the archive with:
-# spectool -g mingw-headers.spec
-Source0:        http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w64.git/mingw-w64-mingw-w64-%{snapshot_rev}.zip
-%else
-Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}%{?pre:-%{pre}}.tar.bz2
-%endif
-
-# Our RPM macros automatically set the environment variable WIDL
-# This confuses the mingw-headers configure scripts and causes various
-# headers to be regenerated from their .idl source. Prevent this from
-# happening as the .idl files shouldn't be used by default
+Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
 Patch0:         mingw-headers-no-widl.patch
 
 BuildArch:      noarch
@@ -48,8 +27,8 @@ Requires:       mingw32-filesystem >= 95
 Requires:       mingw32-winpthreads
 %endif
 
-Obsoletes:      mingw32-w32api < 3.17-3%{?dist}
-Provides:       mingw32-w32api = 3.17-3%{?dist}
+Obsoletes:      mingw32-w32api < 3.17-3
+Provides:       mingw32-w32api = 3.17-3
 
 %description -n mingw32-headers
 MinGW Windows cross-compiler Win32 header files.
@@ -66,15 +45,7 @@ MinGW Windows cross-compiler Win64 header files.
 
 
 %prep
-%if 0%{?snapshot_date}
-rm -rf mingw-w64-v%{version}
-mkdir mingw-w64-v%{version}
-cd mingw-w64-v%{version}
-unzip %{S:0}
-%autosetup -p1 -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
-%else
-%autosetup -p1 -n mingw-w64-v%{version}%{?pre:-%{pre}}
-%endif
+%autosetup -p1 -n mingw-w64-v%{version}
 
 
 %build
@@ -88,7 +59,6 @@ pushd mingw-w64-headers
     %mingw_make_install DESTDIR=%{buildroot}
 popd
 
-# Drop the dummy pthread headers if necessary
 %if 0%{?bundle_dummy_pthread_headers} == 0
 rm -f %{buildroot}%{mingw32_includedir}/pthread_signal.h
 rm -f %{buildroot}%{mingw32_includedir}/pthread_time.h
@@ -109,6 +79,9 @@ rm -f %{buildroot}%{mingw64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Thu Nov 12 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-5
+- Set bundle_dummy_pthread_headers to 0
+
 * Fri Oct 16 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-4
 - Set bundle_dummy_pthread_headers to 1