Merge branch 'master' into f19

This commit is contained in:
Vincent Batts 2014-05-20 15:37:22 -04:00
commit a5ed0429aa
1 changed files with 21 additions and 18 deletions

View File

@ -39,7 +39,7 @@
Name: golang
Version: 1.2.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: The Go Programming Language
License: BSD
@ -583,55 +583,55 @@ fi
# All these archives need to be newer than the corresponding source in goroot
# https://bugzilla.redhat.com/show_bug.cgi?id=1099206
%post pkg-linux-386
find %{goroot}/pkg/linux_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=linux GOARCH=386 go install std
%post pkg-linux-amd64
find %{goroot}/pkg/linux_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=linux GOARCH=amd64 go install std
%post pkg-linux-arm
find %{goroot}/pkg/linux_arm/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=linux GOARCH=arm go install std
%post pkg-darwin-386
find %{goroot}/pkg/darwin_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=darwin GOARCH=386 go install std
%post pkg-darwin-amd64
find %{goroot}/pkg/darwin_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=darwin GOARCH=amd64 go install std
%post pkg-windows-386
find %{goroot}/pkg/windows_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=windows GOARCH=386 go install std
%post pkg-windows-amd64
find %{goroot}/pkg/windows_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=windows GOARCH=amd64 go install std
%post pkg-plan9-386
find %{goroot}/pkg/plan9_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=plan9 GOARCH=386 go install std
%post pkg-plan9-amd64
find %{goroot}/pkg/plan9_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=plan9 GOARCH=amd64 go install std
%post pkg-freebsd-386
find %{goroot}/pkg/freebsd_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=freebsd GOARCH=386 go install std
%post pkg-freebsd-amd64
find %{goroot}/pkg/freebsd_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=freebsd GOARCH=amd64 go install std
%post pkg-freebsd-arm
find %{goroot}/pkg/freebsd_arm/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=freebsd GOARCH=arm go install std
%post pkg-netbsd-386
find %{goroot}/pkg/netbsd_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=netbsd GOARCH=386 go install std
%post pkg-netbsd-amd64
find %{goroot}/pkg/netbsd_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=netbsd GOARCH=amd64 go install std
%post pkg-netbsd-arm
find %{goroot}/pkg/netbsd_arm/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=netbsd GOARCH=arm go install std
%post pkg-openbsd-386
find %{goroot}/pkg/openbsd_386/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=openbsd GOARCH=386 go install std
%post pkg-openbsd-amd64
find %{goroot}/pkg/openbsd_amd64/ -type f -name '*.a' -exec touch "{}" \;
GOROOT=%{goroot} GOOS=openbsd GOARCH=amd64 go install std
%files
%doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION
@ -960,6 +960,9 @@ find %{goroot}/pkg/openbsd_amd64/ -type f -name '*.a' -exec touch "{}" \;
%changelog
* Tue May 20 2014 Vincent Batts <vbatts@redhat.com> 1.2.2-5
- bz1099206 more fixing. Let go fix its own timestamps and freshness
* Tue May 20 2014 Vincent Batts <vbatts@redhat.com> 1.2.2-4
- fix the existence and alternatives of `go` and `gofmt`