diff --git a/mingw-winpthreads.spec b/mingw-winpthreads.spec index 88fd9ccb69597a1f8d512717c7eeb90b1649f792..aa03283615f3b20c91b86b06ab7502af4aedad45 100644 --- a/mingw-winpthreads.spec +++ b/mingw-winpthreads.spec @@ -1,42 +1,18 @@ %?mingw_package_header -#%%global snapshot_date 20160204 -#%%global snapshot_rev 38410ad06264949efcb331f7a63575c6be31c5e4 -#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) -#%%global branch trunk - -#%%global pre rc2 - -# Run the testsuite %global enable_tests 0 Name: mingw-winpthreads Version: 6.0.0 -Release: 3%{?dist} +Release: 4 Summary: MinGW pthread library - -# The main license of winpthreads is MIT, but parts of this library -# are derived from the "Posix Threads library for Microsoft Windows" -# http://locklessinc.com/articles/pthreads_on_windows/ License: MIT and BSD 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 - +Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2 BuildArch: noarch - -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw32-filesystem >= 95 mingw64-filesystem >= 95 +BuildRequires: mingw32-gcc-c++ mingw64-gcc-c++ +BuildRequires: mingw32-crt mingw64-crt %if 0%{?enable_tests} BuildRequires: wine-wow @@ -57,7 +33,6 @@ Win32 does not, and is unlikely to ever, support pthreads natively. This project seeks to provide a freely available and high-quality solution to this problem. -# Win32 %package -n mingw32-winpthreads Summary: MinGW pthread library for the win32 target Obsoletes: mingw32-pthreads < 2.8.0-25.20110511cvs @@ -87,7 +62,6 @@ Provides: mingw32-pthreads-static = 2.8.0-25.20110511cvs %description -n mingw32-winpthreads-static Static version of the MinGW Windows pthreads library. -# Win64 %package -n mingw64-winpthreads Summary: MinGW pthread library for the win64 target Obsoletes: mingw64-pthreads < 2.8.0-25.20110511cvs @@ -122,15 +96,7 @@ Static version of the MinGW Windows pthreads library. %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 @@ -143,17 +109,14 @@ popd %if 0%{?enable_tests} %check -# Prepare a wine prefix export WINEPREFIX=/tmp/wine-winpthreads mkdir $WINEPREFIX winecfg || : -# Run the tests pushd mingw-w64-libraries/winpthreads %mingw_make check -k || : popd -# Clean up the wine prefix wineserver --kill || : rm -rf /tmp/wine-winpthreads @@ -165,11 +128,9 @@ pushd mingw-w64-libraries/winpthreads %mingw_make install DESTDIR=$RPM_BUILD_ROOT popd -# Drop all .la files find $RPM_BUILD_ROOT -name "*.la" -delete -# Win32 %files -n mingw32-winpthreads %license COPYING %{mingw32_bindir}/libwinpthread-1.dll @@ -187,7 +148,6 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_libdir}/libwinpthread.a %{mingw32_libdir}/libpthread.a -# Win64 %files -n mingw64-winpthreads %license COPYING %{mingw64_bindir}/libwinpthread-1.dll @@ -207,5 +167,8 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Nov 04 2020 Zhiyi Weng - 6.0.0-4 +- Add build require mingw-crt for bootstrap. + * Fri Oct 09 2020 Zhiyi Weng - 6.0.0-3 - Initial version.