Merge branch 'master' into f20

Conflicts:
	.gitignore

.gitignore

@@ -5,6 +5,7 @@
 /go1.2.src.tar.gz
 /go1.3.1.src.tar.gz
 /go1.3.2.src.tar.gz
+/go1.3.3.src.tar.gz
 /go1.3beta2.src.tar.gz
 /go1.3rc1.src.tar.gz
 /go1.3rc2.src.tar.gz

golang.spec

@@ -41,7 +41,7 @@
 %endif
 
 Name:           golang
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 
@@ -82,9 +82,6 @@ Patch4:         ./go1.3-tar_reuse_buffer_writeHeader.patch
 # https://code.google.com/p/go/source/detail?r=1b17b3426e3c
 Patch5:         ./go1.3-tar-fix_writing_of_pax_headers.patch
 
-# https://code.google.com/p/go/issues/detail?id=8547
-Patch6:         ./skip_syndey_time_test.patch
-
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
 
@@ -362,9 +359,6 @@ end
 # buffer the PAX header
 %patch5 -p1
 
-# new tzinfo breaks a single unit test
-%patch6 -p1
-
 # create a [dirty] gcc wrapper to allow us to build with our own flags
 # (dirty because it is spoofing 'gcc' since CC value is stored in the go tool)
 # TODO: remove this and just set CFLAGS/LDFLAGS once upstream supports it
@@ -903,6 +897,9 @@ fi
 
 
 %changelog
+* Wed Oct 01 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.3-1
+- update to go1.3.3 (bz1146882)
+
 * Mon Sep 29 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.2-1
 - update to go1.3.2 (bz1147324)
 

skip_syndey_time_test.patch

@@ -1,13 +0,0 @@
-Index: go/src/pkg/time/format_test.go
-===================================================================
---- go.orig/src/pkg/time/format_test.go
-+++ go/src/pkg/time/format_test.go
-@@ -183,7 +183,7 @@ func TestParse(t *testing.T) {
- 	}
- }
- 
--func TestParseInSydney(t *testing.T) {
-+func testParseInSydney(t *testing.T) {
- 	loc, err := LoadLocation("Australia/Sydney")
- 	if err != nil {
- 		t.Fatal(err)

sources

@@ -1,2 +1,2 @@
 d76dc07e475b2905b5fec1cf319b6356  golang-19087:a15f344a9efa-xattrs.tar
-72982ca92b8fbb74ad9b5a056bca9cbf  go1.3.2.src.tar.gz
+2cdbad6baefcf1007f3cf54a5bc878b7  go1.3.3.src.tar.gz