accomdate the move of hostname command for rawhide

This commit is contained in:
Vincent Batts 2013-11-21 12:25:57 -05:00
parent 7025cc82ad
commit c91e9b6b85
2 changed files with 24 additions and 0 deletions

13
golang-f21-hostname.patch Normal file
View File

@ -0,0 +1,13 @@
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 {
t.Fatal(err)
}
- 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 {
t.Fatal(err)
}

View File

@ -32,7 +32,14 @@ License: BSD
URL: http://golang.org/
Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz
# this command moved places
%if 0%{?fedora} >= 21
BuildRequires: /usr/bin/hostname
Patch1: golang-f21-hostname.patch
%else
BuildRequires: /bin/hostname
%endif
BuildRequires: emacs xemacs xemacs-packages-extra
# We strip the meta dependency, but go does require glibc.
@ -124,6 +131,10 @@ end
# increase verbosity of build
%patch0 -p1
%if 0%{?fedora} >= 21
%patch1 -p1
%endif
# Fix BZ#1010271
%patch10 -p1
%patch11 -p1