Merge branch 'master' into epel7
This commit is contained in:
commit
89650786aa
20
golang.spec
20
golang.spec
|
@ -39,7 +39,7 @@
|
|||
|
||||
Name: golang
|
||||
Version: 1.2.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: The Go Programming Language
|
||||
|
||||
License: BSD
|
||||
|
@ -636,9 +636,14 @@ fi
|
|||
%{goroot}/src/
|
||||
# files that are generated based on compile-time ARCH will go in that arch's pkg-bin-*
|
||||
%ifarch %{ix86}
|
||||
|
||||
# this is wacky that now these files are generated in a different arch
|
||||
%exclude %{goroot}/src/cmd/8l/enam.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
|
||||
%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
|
||||
%exclude %{goroot}/src/cmd/6l/enam.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
|
||||
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
|
||||
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_386.c
|
||||
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_386.c
|
||||
|
@ -653,8 +658,9 @@ fi
|
|||
|
||||
%ifarch x86_64
|
||||
%exclude %{goroot}/src/cmd/6l/enam.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
|
||||
%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
|
||||
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
|
||||
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
|
||||
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
|
||||
|
@ -669,8 +675,11 @@ fi
|
|||
|
||||
%ifarch %{arm}
|
||||
%exclude %{goroot}/src/cmd/5l/enam.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
|
||||
%exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go
|
||||
%exclude %{goroot}/src/cmd/6l/enam.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
|
||||
|
||||
%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
|
||||
%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_arm.c
|
||||
%exclude %{goroot}/src/pkg/runtime/zmprof_linux_arm.c
|
||||
|
@ -895,6 +904,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri May 09 2014 Vincent Batts <vbatts@redhat.com> 1.2.2-2
|
||||
- more arch file shuffling
|
||||
|
||||
* Fri May 09 2014 Vincent Batts <vbatts@redhat.com> 1.2.2-1
|
||||
- update to go1.2.2
|
||||
|
||||
|
|
Loading…
Reference in New Issue