Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2017-06-09 15:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-packaging" Fri Jun 9 15:55:42 2017 rev:19 rq:501677 version:15.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2017-03-31 15:10:19.685253925 +0200 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2017-06-09 15:55:47.801309584 +0200 @@ -1,0 +2,32 @@ +Wed Jun 07 09:20:59 UTC 2017 - [email protected] + +- Update to version 15.0.4: + * Handle extra_flags for build/test correctly + * set correct modifier if no arguments are provided + * Remove duplicates when finding Requires + * fix GOPATH and macros + * Fix Provides and Requires for some builds + +------------------------------------------------------------------- +Thu Jun 1 12:24:34 UTC 2017 - [email protected] + +- fix GOPATH for Provides and Requires + +------------------------------------------------------------------- +Wed May 24 11:33:20 UTC 2017 - [email protected] + +- Fix all %go_*dir macros + +------------------------------------------------------------------- +Tue May 23 13:28:43 UTC 2017 - [email protected] + +- fix GOPATH issue + +------------------------------------------------------------------- +Sun May 21 15:07:29 UTC 2017 - [email protected] + +- fix gopath after updating go to 1.8. With go 1.8, there is no more + /usr/share/go/contrib but /usr/share/go/1.8/contrib + gopath.patch: contains the fix + +------------------------------------------------------------------- Old: ---- golang-packaging-15.0.3.tar.xz New: ---- golang-packaging-15.0.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.P8icGf/_old 2017-06-09 15:55:48.329235071 +0200 +++ /var/tmp/diff_new_pack.P8icGf/_new 2017-06-09 15:55:48.329235071 +0200 @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 15.0.3 +Version: 15.0.4 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.P8icGf/_old 2017-06-09 15:55:48.361230554 +0200 +++ /var/tmp/diff_new_pack.P8icGf/_new 2017-06-09 15:55:48.365229990 +0200 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="filename">golang-packaging</param> <param name="exclude">.git</param> - <param name="versionformat">15.0.3</param> - <param name="revision">v15.0.3</param> + <param name="versionformat">15.0.4</param> + <param name="revision">v15.0.4</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ golang-packaging-15.0.3.tar.xz -> golang-packaging-15.0.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.3/CHANGELOG new/golang-packaging-15.0.4/CHANGELOG --- old/golang-packaging-15.0.3/CHANGELOG 2017-03-29 14:32:44.000000000 +0200 +++ new/golang-packaging-15.0.4/CHANGELOG 2017-06-06 17:37:25.000000000 +0200 @@ -1,3 +1,8 @@ +== update version 15.0.4 == + + * Include go API version in GOPATH and macros + * Fix Requires and Provides + == update version 15.0.3 == * Remove duplicates when finding Requires diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.3/golang.prov new/golang-packaging-15.0.4/golang.prov --- old/golang-packaging-15.0.3/golang.prov 2017-03-29 14:32:44.000000000 +0200 +++ new/golang-packaging-15.0.4/golang.prov 2017-06-06 17:37:25.000000000 +0200 @@ -1,6 +1,10 @@ #!/usr/bin/env bash -export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib +if [[ -z "${RPM_BUILD_ROOT}" ]]; then + export RPM_BUILD_ROOT="$(cat /tmp/buildrootpath.txt)" +fi + +export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}" export GO15VENDOREXPERIMENT=1 IMPORT="$(cat /tmp/importpath.txt)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.3/golang.req new/golang-packaging-15.0.4/golang.req --- old/golang-packaging-15.0.3/golang.req 2017-03-29 14:32:44.000000000 +0200 +++ new/golang-packaging-15.0.4/golang.req 2017-06-06 17:37:25.000000000 +0200 @@ -1,6 +1,10 @@ #!/usr/bin/env bash -export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib +if [[ -z "${RPM_BUILD_ROOT}" ]]; then + export RPM_BUILD_ROOT="$(cat /tmp/buildrootpath.txt)" +fi + +export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}" export GO15VENDOREXPERIMENT=1 IMPORT="$(cat /tmp/importpath.txt)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.3/golang.sh new/golang-packaging-15.0.4/golang.sh --- old/golang-packaging-15.0.3/golang.sh 2017-03-29 14:32:44.000000000 +0200 +++ new/golang-packaging-15.0.4/golang.sh 2017-06-06 17:37:25.000000000 +0200 @@ -2,6 +2,10 @@ set -e set -x +store_buildroot_path() { + echo ${RPM_BUILD_ROOT} >| /tmp/buildrootpath.txt +} + store_import_path() { echo ${1} >| /tmp/importpath.txt } @@ -30,7 +34,7 @@ } get_gocontrib_path() { - echo "$(rpm --eval %{_datadir})/go/contrib" + echo "$(rpm --eval %{_datadir})/go/$(rpm --eval %go_api_ver)/contrib" } get_contrib_path() { @@ -75,6 +79,7 @@ process_prepare() { store_import_path "${1}" check_import_path + store_buildroot_path echo "Creating build path $(get_destination_path)" rm -rf $(get_destination_path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.3/macros.go new/golang-packaging-15.0.4/macros.go --- old/golang-packaging-15.0.3/macros.go 2017-03-29 14:32:44.000000000 +0200 +++ new/golang-packaging-15.0.4/macros.go 2017-06-06 17:37:25.000000000 +0200 @@ -6,19 +6,18 @@ # -%go_ver %(LC_ALL=C rpm -q --qf '%%{epoch}:%%{version}\\n' go | sed -e 's/(none)://' -e 's/ 0:/ /' | grep -v "is not") -%go_arch %(%{_prefix}/lib/rpm/golang.sh arch) -%go_build_ver %(go version | sed 's/^go version //' | sed 's:\/::g' | tr -d ' ' | cut -c 1-7 ) -%go_api_ver %(echo %{go_ver} | sed 's/\.[0-9]$//') +%go_arch %(%{_prefix}/lib/rpm/golang.sh arch) +%go_ver %(go version | awk '{print $3}' | sed 's/go//') +%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_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/%{go_api_ver}/pkg/tool/linux_%{go_arch} %go_nostrip \ %undefine _build_create_debug \
