commit golang-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2018-06-02 11:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-packaging" Sat Jun 2 11:56:32 2018 rev:23 rq:613321 version:15.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2018-02-15 13:22:25.450693680 +0100 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2018-06-02 11:56:33.310301985 +0200 @@ -1,0 +2,24 @@ +Thu May 31 15:24:50 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 15.0.10: + * update changelog to v15.0.10 + * This flag does not exist for go 1.10 because this is an extra flag that openSUSE was adding into the go packages in order to fix + * Revert "only add the s flag if go is less than 1.10" + * only add the s flag if go is less than 1.10 + * Revert "Pass linker flag via ldflags" + * update changelog: add 15.0.9 version + * Pass linker flag via ldflags + * Bump version 15.0.8 + * Fix the handling of quoted extra args + * bump version to v15.0.7 + +- Add Requires rpmdev-tools as this is used to compare versions in the + golang.sh script + +------------------------------------------------------------------- +Tue May 29 10:32:08 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 15.0.9: + * Pass linker flag via ldflags + +------------------------------------------------------------------- Old: ---- golang-packaging-15.0.8.tar.xz New: ---- golang-packaging-15.0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.yOMnQG/_old 2018-06-02 11:56:34.250267516 +0200 +++ /var/tmp/diff_new_pack.yOMnQG/_new 2018-06-02 11:56:34.250267516 +0200 @@ -17,10 +17,10 @@ Name: golang-packaging -Version: 15.0.8 +Version: 15.0.10 Release: 0 Summary: A toolchain to help packaging golang -License: GPL-3.0 +License: GPL-3.0-only Group: Development/Languages/Golang Url: https://github.com/openSUSE/%{name} Source: %{name}-%{version}.tar.xz @@ -28,6 +28,7 @@ BuildRequires: rpm BuildRequires: xz Requires: go +Requires: rpmdevtools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.yOMnQG/_old 2018-06-02 11:56:34.278266489 +0200 +++ /var/tmp/diff_new_pack.yOMnQG/_new 2018-06-02 11:56:34.278266489 +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.8</param> - <param name="revision">v15.0.8</param> + <param name="versionformat">15.0.10</param> + <param name="revision">v15.0.10</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ golang-packaging-15.0.8.tar.xz -> golang-packaging-15.0.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.8/CHANGELOG new/golang-packaging-15.0.10/CHANGELOG --- old/golang-packaging-15.0.8/CHANGELOG 2018-02-12 17:38:45.000000000 +0100 +++ new/golang-packaging-15.0.10/CHANGELOG 2018-05-31 17:23:12.000000000 +0200 @@ -1,3 +1,9 @@ +== update version 15.0.10 == + * Remove s flag for go version >= 1.10 + +== update version 15.0.9 == + * Pass linker flag via ldflags + == update version 15.0.8 == * Fix the handling of quoted extra args to the gobuild and gotest macros. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-15.0.8/golang.sh new/golang-packaging-15.0.10/golang.sh --- old/golang-packaging-15.0.8/golang.sh 2018-02-12 17:38:45.000000000 +0100 +++ new/golang-packaging-15.0.10/golang.sh 2018-05-31 17:23:12.000000000 +0200 @@ -2,6 +2,19 @@ set -e set -x +go_version() { + go version | awk '{print $3}' | sed 's/go//' +} + +# version_lt exits 0 if the first version is less than the second +# example: +# version_lt 1.9.3 1.10 && echo "yes" +# will echo "yes" +version_lt() { + rpmdev-vercmp $1 $2 > /dev/null + [ $? == 12 ] #rpmdev-vercmp returns 12 if the first version is less than the second +} + store_buildroot_path() { echo ${RPM_BUILD_ROOT} >| /tmp/buildrootpath.txt } @@ -127,7 +140,16 @@ local last=$(($#-1)) fi - local build_flags="-s -v -p 4 -x -buildmode=pie" + local build_flags="-v -p 4 -x -buildmode=pie" + # Add s flag if go is older than 1.10. + # s flag is an openSUSE flag to fix + # https://bugzilla.suse.com/show_bug.cgi?id=776058 + # This flag is added with a patch in the openSUSE package, thus it only + # exists in openSUSE go packages, and only on versions < 1.10. + # In go >= 1.10, this bug is fixed upstream and the patch that was adding the + # s flag has been removed from the openSUSE packages. + ver=$(go_version) + version_lt $ver 1.10 && build_flags="-s $build_flags" local extra_flags=( "${@:1:$last}" )
participants (1)
-
root