update version to 7.0.0

This commit is contained in:
yinhongchang 2024-02-05 14:50:29 +08:00
parent 662f3f526e
commit fa67b0c8c5
3 changed files with 56 additions and 14 deletions

View File

@ -1,7 +1,7 @@
diff -rupN mingw-w64-v6.0.0/mingw-w64-headers/configure mingw-w64-v6.0.0-new/mingw-w64-headers/configure
--- mingw-w64-v6.0.0/mingw-w64-headers/configure 2018-09-14 16:16:43.000000000 +0200
+++ mingw-w64-v6.0.0-new/mingw-w64-headers/configure 2019-05-07 17:04:47.100390886 +0200
@@ -2576,7 +2576,7 @@ fi
diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-headers/configure mingw-w64-v7.0.0-new/mingw-w64-headers/configure
--- mingw-w64-v7.0.0/mingw-w64-headers/configure 2019-11-09 06:33:24.000000000 +0100
+++ mingw-w64-v7.0.0-new/mingw-w64-headers/configure 2020-06-20 00:23:32.741651379 +0200
@@ -2574,7 +2574,7 @@ fi
$as_echo "$with_widl" >&6; }
if test "x$with_widl" = xno; then :
@ -10,9 +10,9 @@ diff -rupN mingw-w64-v6.0.0/mingw-w64-headers/configure mingw-w64-v6.0.0-new/min
else
if test "x$srcdir" = x.; then :
diff -rupN mingw-w64-v6.0.0/mingw-w64-headers/configure.ac mingw-w64-v6.0.0-new/mingw-w64-headers/configure.ac
--- mingw-w64-v6.0.0/mingw-w64-headers/configure.ac 2018-09-14 16:16:43.000000000 +0200
+++ mingw-w64-v6.0.0-new/mingw-w64-headers/configure.ac 2019-05-07 17:04:47.100390886 +0200
diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-headers/configure.ac mingw-w64-v7.0.0-new/mingw-w64-headers/configure.ac
--- mingw-w64-v7.0.0/mingw-w64-headers/configure.ac 2019-11-09 06:33:24.000000000 +0100
+++ mingw-w64-v7.0.0-new/mingw-w64-headers/configure.ac 2020-06-20 00:23:32.742651379 +0200
@@ -27,7 +27,7 @@ AC_ARG_WITH([widl],
[AS_VAR_SET([with_widl],[no])])
AC_MSG_RESULT([$with_widl])

View File

@ -1,13 +1,43 @@
%global bundle_dummy_pthread_headers 0
#%%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
# The mingw-w64-headers provide the headers pthread_time.h
# and pthread_unistd.h by default and are dummy headers.
# The real implementation for these headers is in a separate
# library called winpthreads. As long as winpthreads isn't
# available (and the old pthreads-w32 implementation is used)
# 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
%global bundle_dummy_pthread_headers 1
Name: mingw-headers
Version: 6.0.0
Release: 5
Version: 7.0.0
Release: 1%{?dist}
Summary: Win32/Win64 header files
License: Public Domain and LGPLv2+ and ZPLv2.1
URL: http://mingw-w64.sourceforge.net/
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
%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
Patch0: mingw-headers-no-widl.patch
BuildArch: noarch
@ -27,8 +57,8 @@ Requires: mingw32-filesystem >= 95
Requires: mingw32-winpthreads
%endif
Obsoletes: mingw32-w32api < 3.17-3
Provides: mingw32-w32api = 3.17-3
Obsoletes: mingw32-w32api < 3.17-3%{?dist}
Provides: mingw32-w32api = 3.17-3%{?dist}
%description -n mingw32-headers
MinGW Windows cross-compiler Win32 header files.
@ -45,7 +75,15 @@ MinGW Windows cross-compiler Win64 header files.
%prep
%autosetup -p1 -n mingw-w64-v%{version}
%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
%build
@ -59,6 +97,7 @@ 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
@ -79,6 +118,9 @@ rm -f %{buildroot}%{mingw64_includedir}/pthread_unistd.h
%changelog
* Sat Jun 20 2020 Sandro Mani <manisandro@gmail.com> - 7.0.0-1
- Update to 7.0.0
* Thu Nov 12 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-5
- Set bundle_dummy_pthread_headers to 0