From 75ea2a65a04eb18db35766ba83dc66aa33d2a7ed0e30226313528fab501db605 Mon Sep 17 00:00:00 2001 From: Jeff Kowalczyk Date: Sat, 16 Nov 2019 06:42:21 +0000 Subject: [PATCH] Accepting request 749020 from home:jfkw:branches:devel:languages:go - Update to version 15.0.12: * Drop ppc64-nopie.patch * golang.sh: integrate ppc64-nopie.patch -buildmode=pie only on ppc64 * golang.sh: avoid excessive "rpm --eval..." calls * Install Bazel files in src directory * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency * Remove s build flag no longer supported in go 1.10 boo#776058 * Packaging: improve _service tar_scm declarations add _servicedata the spec file. OBS-URL: https://build.opensuse.org/request/show/749020 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=66 --- _service | 5 +++-- _servicedata | 4 ++++ golang-packaging-15.0.11.tar.xz | 3 --- golang-packaging-15.0.12.tar.xz | 3 +++ golang-packaging.changes | 14 +++++++++++++- golang-packaging.spec | 10 ++++------ ppc64-nopie.patch | 15 --------------- 7 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 _servicedata delete mode 100644 golang-packaging-15.0.11.tar.xz create mode 100644 golang-packaging-15.0.12.tar.xz delete mode 100644 ppc64-nopie.patch diff --git a/_service b/_service index bb505b2..672e22d 100644 --- a/_service +++ b/_service @@ -4,9 +4,10 @@ git golang-packaging .git - 15.0.11 - v15.0.11 + @PARENT_TAG@ + v15.0.12 enable + v(.*) *.tar diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..7cdbca6 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/golang-packaging + 7898ac7e21212888bd3a2ba014871bb4b48e5c0b \ No newline at end of file diff --git a/golang-packaging-15.0.11.tar.xz b/golang-packaging-15.0.11.tar.xz deleted file mode 100644 index 6cc5e0b..0000000 --- a/golang-packaging-15.0.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a16e0ed3a809cd8a8e98d1d4a42cd571c043c4909f5060bdda8b49d882d79b6 -size 16444 diff --git a/golang-packaging-15.0.12.tar.xz b/golang-packaging-15.0.12.tar.xz new file mode 100644 index 0000000..6e4e290 --- /dev/null +++ b/golang-packaging-15.0.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff4ca70bfb986ea057bedcf27fbbc212303fd6e862b1d3a65cd97436e9e398a +size 16648 diff --git a/golang-packaging.changes b/golang-packaging.changes index e49c7e8..e48e039 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,9 +1,21 @@ +------------------------------------------------------------------- +Sat Nov 16 05:45:43 UTC 2019 - jkowalczyk@suse.com + +- Update to version 15.0.12: + * Drop ppc64-nopie.patch + * golang.sh: integrate ppc64-nopie.patch -buildmode=pie only on ppc64 + * golang.sh: avoid excessive "rpm --eval..." calls + * Install Bazel files in src directory + * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency + * Remove s build flag no longer supported in go 1.10 boo#776058 + * Packaging: improve _service tar_scm declarations add _servicedata + ------------------------------------------------------------------- Wed Jun 13 11:02:18 UTC 2018 - jmassaguerpla@suse.com - We don't need to require rpmdev, because we updated to 15.0.11 to remove that requirement. I missed to remove the req from - the spec file. + the spec file. ------------------------------------------------------------------- Tue Jun 12 18:40:23 UTC 2018 - msuchanek@suse.com diff --git a/golang-packaging.spec b/golang-packaging.spec index 275ee21..837d0a5 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -1,7 +1,7 @@ # # spec file for package golang-packaging # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: golang-packaging -Version: 15.0.11 +Version: 15.0.12 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0-only Group: Development/Languages/Golang -Url: https://github.com/openSUSE/%{name} +URL: https://github.com/openSUSE/%{name} Source: %{name}-%{version}.tar.xz -Patch: ppc64-nopie.patch BuildRequires: rpm BuildRequires: xz @@ -37,7 +36,6 @@ A toolchain to help packaging golang, written in bash. %prep %setup -q -%patch -p1 %build diff --git a/ppc64-nopie.patch b/ppc64-nopie.patch deleted file mode 100644 index c5dfc94..0000000 --- a/ppc64-nopie.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- golang-packaging-15.0.11/golang.sh~ 2018-06-11 16:17:13.000000000 +0200 -+++ golang-packaging-15.0.11/golang.sh 2018-06-12 20:35:41.617659481 +0200 -@@ -139,7 +139,11 @@ - local last=$(($#-1)) - fi - -- local build_flags="-v -p 4 -x -buildmode=pie" -+ local build_flags="-v -p 4 -x" -+ case "$(uname -m)" in -+ ppc64) ;; -+ *) build_flags="$build_flags -buildmode=pie" ;; -+ esac - # 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