[golang] not sure why go1.2.2 shuffled some of the arch-depenedent files, but so it goes

Vincent Batts vbatts at fedoraproject.org
Mon May 12 13:30:08 UTC 2014


commit 573d0baf6acb69f8fd279fd74b7c45b00463072b
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon May 12 09:29:32 2014 -0400

    not sure why go1.2.2 shuffled some of the arch-depenedent files, but so it goes

 golang.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index ae77ac1..22736e1 100644
--- a/golang.spec
+++ b/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}
-%exclude %{goroot}/src/cmd/8l/enam.c
+
+# 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/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/zgoarch_386.go
 %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
@@ -652,9 +657,7 @@ fi
 %endif
 
 %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/zmprof_linux_amd64.c
 %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
 %exclude %{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
@@ -895,6 +898,9 @@ fi
 
 
 %changelog
+* Fri May 09 2014 Vincent Batts <vbatts at redhat.com> 1.2.2-2
+- more arch file shuffling
+
 * Fri May 09 2014 Vincent Batts <vbatts at redhat.com> 1.2.2-1
 - update to go1.2.2
 


More information about the scm-commits mailing list