[golang] more rearranging

[Vincent Batts]

commit 28979baa990379368059d97722dd1134cf2cccfb
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon May 12 15:00:01 2014 -0400

    more rearranging

 golang.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 22736e1..f12a37a 100644
--- a/golang.spec
+++ b/golang.spec
@@ -638,10 +638,8 @@ fi
 %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/zgoarch_386.go
-%exclude %{goroot}/src/cmd/6l/enam.c
-%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
+%exclude %{goroot}/src/cmd/8l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
 
 %exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
 %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
@@ -657,6 +655,9 @@ fi
 %endif
 
 %ifarch x86_64
+%exclude %{goroot}/src/cmd/6l/enam.c
+%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
@@ -672,8 +673,9 @@ 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/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