From 148df2806a39138780e5cc3a95fa9e3823f5ff29 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 24 May 2014 15:03:15 +0200 Subject: [PATCH] Update to 20140524 snapshot (git rev 502c72) --- .gitignore | 1 + mingw-crt.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a42dec3..914143a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /mingw-w64-code-6477-trunk.zip /mingw-w64-code-6497-trunk.zip /mingw-w64-code-6559-trunk.zip +/mingw-w64-mingw-w64-502c72047e68fecf07f628628b75296863ff5b35.zip diff --git a/mingw-crt.spec b/mingw-crt.spec index 102e911..5d0ac40 100644 --- a/mingw-crt.spec +++ b/mingw-crt.spec @@ -1,12 +1,13 @@ %{?mingw_package_header} -%global snapshot_date 20140330 -%global snapshot_rev 6559 +%global snapshot_date 20140524 +%global snapshot_rev 502c72047e68fecf07f628628b75296863ff5b35 +%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) %global branch trunk Name: mingw-crt Version: 3.1.999 -Release: 0.8.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist} +Release: 0.9.%{branch}.git%{snapshot_rev_short}.%{snapshot_date}%{?dist} Summary: MinGW Windows cross-compiler runtime License: Public Domain and ZPLv2.1 @@ -14,11 +15,11 @@ 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 +# 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-crt.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 @@ -65,7 +66,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 @@ -99,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/*.c %changelog +* Sat May 24 2014 Erik van Pienbroek - 3.1.999-0.9.trunk.git502c72.20140524 +- Update to 20140524 snapshot (git rev 502c72) +- Upstream has switched from SVN to Git + * Sun Mar 30 2014 Erik van Pienbroek - 3.1.999-0.8.trunk.r6559.20140330 - Update to r6559 (20140330 snapshot) - Fixes Windows XP compatibility issue in mingw-glib-networking diff --git a/sources b/sources index 451ed8b..3b5fe9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8370d4a3550cc8ed32726daf28c03375 mingw-w64-code-6559-trunk.zip +b73334ae88745e506f34aae0fc7ce593 mingw-w64-mingw-w64-502c72047e68fecf07f628628b75296863ff5b35.zip