Accepting request 252295 from home:cbosdonnat:branches:devel:languages:go

- Fixed %go_contribsrcdir value
- Copy temporary macros.go as go.macros to avoid it to be built

OBS-URL: https://build.opensuse.org/request/show/252295
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go?expand=0&rev=196

go.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 25 12:31:43 UTC 2014 - cbosdonnat@suse.com
+
+- Fixed %go_contribsrcdir value
+- Copy temporary macros.go as go.macros to avoid it to be built
+
 -------------------------------------------------------------------
 Mon Sep 22 19:45:17 UTC 2014 - jengelh@inai.de
 

go.spec

@@ -102,17 +102,17 @@ Emacs syntax highlighting scheme for the Go programming language.
 cp %{SOURCE5} .
 
 # setup go_arch (BSD-like scheme)
-cp %{SOURCE3} .
+cp %{SOURCE3} go.macros
 %ifarch %ix86
-sed -i 's|GOARCH|386|' macros.go
+sed -i 's|GOARCH|386|' go.macros
 %define go_arch 386
 %endif
 %ifarch x86_64
-sed -i 's|GOARCH|amd64|' macros.go
+sed -i 's|GOARCH|amd64|' go.macros
 %define go_arch amd64
 %endif
 %ifarch %arm
-sed -i 's|GOARCH|arm|' macros.go
+sed -i 's|GOARCH|arm|' go.macros
 %define go_arch arm
 %endif
 
@@ -185,7 +185,7 @@ rm -rf misc/cgo/test/{_*,*.o,*.out,*.6,*.8}
 rm -f misc/kate/go.xml
 
 # install RPM macros ($GOARCH prepared in %%prep section)
-install -Dm644 macros.go %{buildroot}%{_sysconfdir}/rpm/macros.go
+install -Dm644 go.macros %{buildroot}%{_sysconfdir}/rpm/macros.go
 
 # break hard links
 rm %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/{cgocall,runtime}.h

macros.go

@@ -13,7 +13,7 @@
 %go_sitedir      %{_libdir}/go/pkg
 %go_sitearch     %{_libdir}/go/pkg/linux_%{go_arch}
 %go_contribdir     %{_libdir}/go/contrib/pkg/linux_%{go_arch}
-%go_contribsrcdir  %{_datadir}/go/contrib/src
+%go_contribsrcdir  %{_libdir}/go/contrib/src
 %go_tooldir        %{_datadir}/go/pkg/tool/linux_%{go_arch}
 
 %go_exclusivearch \