pool/golang-packaging
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 497929 from home:thipp:branch:devel:languages:go

Browse Source 
- Fix all %go_*dir macros

OBS-URL: https://build.opensuse.org/request/show/497929
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=47
This commit is contained in:
Jordi Massaguer
2017-05-24 11:37:37 +00:00
committed by Git OBS Bridge
parent 5e6e0f1073
commit 32ab74f379
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
golang-packaging.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 24 11:33:20 UTC 2017 - thipp@suse.de
- Fix all %go_*dir macros
-------------------------------------------------------------------
Tue May 23 13:28:43 UTC 2017 - thipp@suse.de

24
gopath.patch
View File

@@ -21,7 +21,7 @@ index 41029a6..6000f27 100755
IMPORT="$(cat /tmp/importpath.txt)"
diff --git a/golang.sh b/golang.sh
index b5fa364..2509e62 100755
index b5fa364..4f65f16 100755
--- a/golang.sh
+++ b/golang.sh
@@ -30,7 +30,7 @@ get_gobin_path() {
@@ -29,15 +29,15 @@ index b5fa364..2509e62 100755
get_gocontrib_path() {
- echo "$(rpm --eval %{_datadir})/go/contrib"
+ echo "$(rpm --eval %{_datadir})/go/$(rpm --eval '%{go_api_ver}')/contrib"
+ echo "$(rpm --eval %{_datadir})/go/$(rpm --eval %go_api_ver)/contrib"
}
get_contrib_path() {
diff --git a/macros.go b/macros.go
index c6d200e..a27a28d 100644
index c6d200e..ecadcca 100644
--- a/macros.go
+++ b/macros.go
@@ -6,18 +6,17 @@
@@ -6,19 +6,18 @@
#
@@ -50,14 +50,20 @@ index c6d200e..a27a28d 100644
+%go_api_ver %(echo %{go_ver} | grep -Eo '[[:digit:]]+\.[[:digit:]]+')
%go_dir %{_libdir}/go
%go_bindir %{_libdir}/go/bin
%go_srcdir %{_libdir}/go/src
%go_sitedir %{_libdir}/go/pkg
%go_sitearch %{_libdir}/go/pkg/linux_%{go_arch}
-%go_bindir %{_libdir}/go/bin
-%go_srcdir %{_libdir}/go/src
-%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_tooldir %{_datadir}/go/pkg/tool/linux_%{go_arch}
+%go_bindir %{_libdir}/go/%{go_api_ver}/bin
+%go_srcdir %{_libdir}/go/%{go_api_ver}/src
+%go_sitedir %{_libdir}/go/%{go_api_ver}/pkg
+%go_sitearch %{_libdir}/go/%{go_api_ver}/pkg/linux_%{go_arch}
+%go_contribdir %{_libdir}/go/%{go_api_ver}/contrib/pkg/linux_%{go_arch}
+%go_contribsrcdir %{_datadir}/go/%{go_api_ver}/contrib/src/
%go_tooldir %{_datadir}/go/pkg/tool/linux_%{go_arch}
+%go_tooldir %{_datadir}/go/%{go_api_ver}/pkg/tool/linux_%{go_arch}
%go_nostrip \
%undefine _build_create_debug \