From 47f99f50e7ac4691a65f4b3dac5cbed31e938b06 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 28 May 2014 23:04:50 +0200 Subject: [PATCH] Update to 20140524 snapshot (git rev 502c72) --- .gitignore | 1 + mingw-winpthreads.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4064238..7334b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mingw-w64-code-6460-trunk.zip /mingw-w64-code-6497-trunk.zip /mingw-w64-code-6560-trunk.zip +/mingw-w64-mingw-w64-502c72047e68fecf07f628628b75296863ff5b35.zip diff --git a/mingw-winpthreads.spec b/mingw-winpthreads.spec index b5a894c..803329d 100644 --- a/mingw-winpthreads.spec +++ b/mingw-winpthreads.spec @@ -1,7 +1,8 @@ %?mingw_package_header -%global snapshot_date 20140407 -%global snapshot_rev 6560 +%global snapshot_date 20140524 +%global snapshot_rev 502c72047e68fecf07f628628b75296863ff5b35 +%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) %global branch trunk # Run the testsuite @@ -9,7 +10,7 @@ Name: mingw-winpthreads Version: 3.1.999 -Release: 0.4.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist} +Release: 0.5.%{branch}.git%{snapshot_rev_short}.%{snapshot_date}%{?dist} 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" @@ -19,12 +20,12 @@ Group: Development/Libraries URL: http://mingw-w64.sourceforge.net/ %if 0%{?snapshot_date} -# To regerenate a snapshot: -# Use your regular webbrowser to open http://sourceforge.net/p/mingw-w64/code/%{snapshot_rev}/tarball?path=/trunk +# 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-winpthreads.spec -Source0: http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip +# 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 %endif @@ -126,7 +127,7 @@ rm -rf mingw-w64-v%{version} mkdir mingw-w64-v%{version} cd mingw-w64-v%{version} unzip %{S:0} -%setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-code-%{snapshot_rev}-%{branch} +%setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev} %else %setup -q -n mingw-w64-v%{version} %endif @@ -206,6 +207,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed May 28 2014 Erik van Pienbroek - 3.1.999-0.5.trunk.git502c72.20140524 +- Update to 20140524 snapshot (git rev 502c72) +- Upstream has switched from SVN to Git + * Mon Apr 7 2014 Erik van Pienbroek - 3.1.999-0.4.trunk.r6560.20140407 - Update to r6560 (20140407 snapshot) - Fixes potential deadlock diff --git a/sources b/sources index c2dc0c6..3b5fe9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e1a93af9122bb0e553d5bd62c6f874c mingw-w64-code-6560-trunk.zip +b73334ae88745e506f34aae0fc7ce593 mingw-w64-mingw-w64-502c72047e68fecf07f628628b75296863ff5b35.zip