From 55b098074ca89065b375ddf5a4b040ec21ff0fa6 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 26 Jan 2015 21:33:25 +0100 Subject: [PATCH] Update to 4.0rc1 --- .gitignore | 1 + mingw-headers.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6114ad0..b6b4606 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /mingw-w64-mingw-w64-63dba27341bc2c90c76208765909d560d1ef9978.zip /mingw-w64-mingw-w64-dadc8f83c38992fa4e55e9c90d673c194df70686.zip /mingw-w64-mingw-w64-f7337bdf0d70809e720b4e2671758e0c10c16f60.zip +/mingw-w64-v4.0-rc1.tar.bz2 diff --git a/mingw-headers.spec b/mingw-headers.spec index a7caf17..c735bd3 100644 --- a/mingw-headers.spec +++ b/mingw-headers.spec @@ -1,7 +1,9 @@ -%global snapshot_date 20141222 -%global snapshot_rev f7337bdf0d70809e720b4e2671758e0c10c16f60 -%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) -%global branch trunk +#%%global snapshot_date 20141222 +#%%global snapshot_rev f7337bdf0d70809e720b4e2671758e0c10c16f60 +#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) +#%%global branch trunk + +%global pre rc1 # The mingw-w64-headers provide the headers pthread_time.h # and pthread_unistd.h by default and are dummy headers. @@ -19,8 +21,8 @@ %endif Name: mingw-headers -Version: 3.9.999 -Release: 0.5.%{branch}.git.%{snapshot_rev_short}.%{snapshot_date}%{?dist} +Version: 4.0 +Release: 0.1.%{pre}%{?dist} Summary: Win32/Win64 header files License: Public Domain and LGPLv2+ and ZPLv2.1 @@ -35,7 +37,7 @@ URL: http://mingw-w64.sourceforge.net/ # 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}.tar.bz2 +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 @@ -86,7 +88,7 @@ cd mingw-w64-v%{version} unzip %{S:0} %setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev} %else -%setup -q -n mingw-w64-v%{version} +%setup -q -n mingw-w64-v%{version}%{?pre:-%{pre}} %endif %patch0 -p0 -b .idl @@ -124,6 +126,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h %changelog +* Mon Jan 26 2015 Erik van Pienbroek - 4.0-0.1.rc1 +- Update to 4.0rc1 + * Mon Dec 22 2014 Erik van Pienbroek - 3.9.999-0.5.trunk.git.f7337b.20141222 - Update to 20141222 snapshot (git rev f7337b) diff --git a/sources b/sources index 2184d6c..892e169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -592eee2d754dcc647a60d3f6046fe987 mingw-w64-mingw-w64-f7337bdf0d70809e720b4e2671758e0c10c16f60.zip +67d489701040c624c0d5d6a10248df0d mingw-w64-v4.0-rc1.tar.bz2