diff --git a/golang-f21-hostname.patch b/golang-f21-hostname.patch index acc3c6c..6025ecb 100644 --- a/golang-f21-hostname.patch +++ b/golang-f21-hostname.patch @@ -1,11 +1,9 @@ -Index: go/src/pkg/os/os_test.go -=================================================================== ---- go.orig/src/pkg/os/os_test.go -+++ go/src/pkg/os/os_test.go -@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str - if err != nil { +--- src/pkg/os/os_test.go.orig 2014-02-20 13:14:45.543644182 -0600 ++++ src/pkg/os/os_test.go 2014-02-20 13:14:55.934813622 -0600 +@@ -854,7 +854,7 @@ t.Fatal(err) } + defer r.Close() - p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}}) + p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}}) if err != nil { diff --git a/golang.spec b/golang.spec index 3dbbcdc..7c495b5 100644 --- a/golang.spec +++ b/golang.spec @@ -151,7 +151,7 @@ end cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar %if 0%{?fedora} >= 21 -%patch210 -p1 +%patch210 -p0 %patch211 -p0 %endif