[mingw-crt] Update to r5915 (20130628 snapshot)

Erik van Pienbroek epienbro at fedoraproject.org
Fri Jun 28 16:50:15 UTC 2013


commit adb66e228c5659664d8c11e80d7956835b2071e1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jun 28 18:50:02 2013 +0200

    Update to r5915 (20130628 snapshot)

 .gitignore                   |    1 +
 mingw-crt.spec               |   20 +++++------
 mingw-w64-commit-r5898.patch |   76 ------------------------------------------
 sources                      |    2 +-
 4 files changed, 11 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a8f61d..45bbb58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /mingw-w64-trunk-snapshot-20130530.tar.gz
 /mingw-w64-trunk-r5894-snapshot-20130614.zip
 /mingw-w64-trunk-r5904-snapshot-20130614.zip
+/mingw-w64-code-5915-trunk.zip
diff --git a/mingw-crt.spec b/mingw-crt.spec
index aa45f41..6d938f3 100644
--- a/mingw-crt.spec
+++ b/mingw-crt.spec
@@ -1,12 +1,12 @@
 %{?mingw_package_header}
 
-%global snapshot_date 20130614
-%global snapshot_rev 5904
+%global snapshot_date 20130628
+%global snapshot_rev 5915
 %global branch trunk
 
 Name:           mingw-crt
 Version:        2.0.999
-Release:        0.27.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
+Release:        0.28.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
 Summary:        MinGW Windows cross-compiler runtime
 
 License:        Public Domain and ZPLv2.1
@@ -14,11 +14,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/5900/tarball?path=/trunk
+# Use your regular webbrowser to open http://sourceforge.net/p/mingw-w64/code/%{snapshot_rev}/tarball?path=/trunk
 # This triggers the SourceForge instructure to generate a snapshot
 # After that you can pull in the archive with:
-# wget http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip -O mingw-w64-%{branch}-r%{snapshot_rev}-snapshot-$(date '+%Y%m%d').zip
-Source0:        mingw-w64-%{branch}-r%{snapshot_rev}-snapshot-%{snapshot_date}.zip
+# wget http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip
+Source0:        mingw-w64-code-%{snapshot_rev}-%{branch}.zip
 %else
 Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz
 %endif
@@ -49,10 +49,6 @@ BuildRequires:  autoconf automake libtool
 # we do a partial revert the commit in question for now
 Patch0:         mingw-w64-workaround-ilockcxch-regression.patch
 
-# Commit r5898 also introduced a similar regression
-# for the win64 target so also revert that one for now
-Patch1:         mingw-w64-commit-r5898.patch
-
 
 %description
 MinGW Windows cross-compiler runtime, base libraries.
@@ -89,7 +85,6 @@ unzip %{S:0}
 %endif
 
 %patch0 -p0 -b .ilockcxch_regression
-%patch1 -p1 -b .r5898 -R
 autoreconf -i --force
 
 
@@ -121,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/*.c
 
 
 %changelog
+* Fri Jun 28 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.28.trunk.r5915.20130628
+- Update to r5915 (20130628 snapshot)
+
 * Fri Jun 14 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.27.trunk.r5904.20130614
 - Update to r5904 (fixes various regressions)
 
diff --git a/sources b/sources
index 45708ab..655601e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9db977e0e774d393ee0760f961175a2  mingw-w64-trunk-r5904-snapshot-20130614.zip
+c4ba2c2b8f27614dc8788c31357924c5  mingw-w64-code-5915-trunk.zip


More information about the scm-commits mailing list