Accepting request 500393 from home:thipp:branches:devel:languages:go

- fix GOPATH for Provides and Requires

OBS-URL: https://build.opensuse.org/request/show/500393
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=48
This commit is contained in:
Jordi Massaguer 2017-06-01 13:05:37 +00:00 committed by Git OBS Bridge
parent 32ab74f379
commit a21f7df38a
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 1 12:24:34 UTC 2017 - thipp@suse.de
- fix GOPATH for Provides and Requires
-------------------------------------------------------------------
Wed May 24 11:33:20 UTC 2017 - thipp@suse.de

View File

@ -1,22 +1,24 @@
diff --git a/golang.prov b/golang.prov
index f373246..08aca8e 100755
index f373246..8bdc52f 100755
--- a/golang.prov
+++ b/golang.prov
@@ -1,6 +1,5 @@
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib
+export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}"
export GO15VENDOREXPERIMENT=1
IMPORT="$(cat /tmp/importpath.txt)"
diff --git a/golang.req b/golang.req
index 41029a6..6000f27 100755
index 41029a6..d501ab5 100755
--- a/golang.req
+++ b/golang.req
@@ -1,6 +1,5 @@
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib
+export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}"
export GO15VENDOREXPERIMENT=1
IMPORT="$(cat /tmp/importpath.txt)"