From ec1155188c27ecad80d7330506b43654c4c0cebb Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@redhat.com>
Date: Wed, 13 Aug 2014 20:37:18 +0000
Subject: [PATCH] update to go1.3.1

---
 .gitignore                       |  1 +
 golang-1.2-BSD-SVID-SOURCE.patch | 11 ++++++-----
 golang.spec                      | 11 +++++++----
 sources                          |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb34c32..737f187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /go1.3rc1.src.tar.gz
 /go1.3rc2.src.tar.gz
 /go1.3.src.tar.gz
+/go1.3.1.src.tar.gz
diff --git a/golang-1.2-BSD-SVID-SOURCE.patch b/golang-1.2-BSD-SVID-SOURCE.patch
index 5e638d6..f4927b6 100644
--- a/golang-1.2-BSD-SVID-SOURCE.patch
+++ b/golang-1.2-BSD-SVID-SOURCE.patch
@@ -1,8 +1,8 @@
-Index: include/u.h
+Index: go/include/u.h
 ===================================================================
---- include/u.h.orig
-+++ include/u.h
-@@ -38,9 +38,12 @@ extern "C" {
+--- go.orig/include/u.h
++++ go/include/u.h
+@@ -38,10 +38,13 @@ extern "C" {
  #		define __MAKECONTEXT_V2_SOURCE 1
  #	endif
  #endif
@@ -10,7 +10,8 @@ Index: include/u.h
 +#define _DEFAULT_SOURCE 1
 +#else
  #define _BSD_SOURCE 1
--#define _NETBSD_SOURCE 1	/* NetBSD */
+ #define _NETBSD_SOURCE 1	/* NetBSD */
+-#define _DEFAULT_SOURCE 1	/* glibc > 2.19 */
  #define _SVID_SOURCE 1
 +#endif
  #if !defined(__APPLE__) && !defined(__OpenBSD__)
diff --git a/golang.spec b/golang.spec
index 3ed3c25..6b41415 100644
--- a/golang.spec
+++ b/golang.spec
@@ -38,13 +38,13 @@
 %endif
 
 Name:           golang
-Version:        1.3
-Release:        11%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        The Go Programming Language
 
 License:        BSD
 URL:            http://golang.org/
-Source0:        http://golang.org/dl/go%{version}.src.tar.gz
+Source0:        https://storage.googleapis.com/golang/go%{version}.src.tar.gz
 
 # this command moved places
 %if 0%{?fedora} >= 21
@@ -339,7 +339,7 @@ end
 
 %if 0%{?fedora} >= 21
 %patch210 -p0
-%patch211 -p0
+%patch211 -p1
 %endif
 
 # increase verbosity of build
@@ -898,6 +898,9 @@ fi
 
 
 %changelog
+* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.1-1
+- update to go1.3.1
+
 * Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-11
 - merged a line wrong
 
diff --git a/sources b/sources
index a687b67..2615dec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 d76dc07e475b2905b5fec1cf319b6356  golang-19087:a15f344a9efa-xattrs.tar
-4b66d7249554181c314f139ea78920b1  go1.3.src.tar.gz
+13e32d14e974e3d903fa2de03581c681  go1.3.1.src.tar.gz