From 53701fbb89ce6cc5afd1fb8792cdee46d5a0003b976195eeb984e5204c3fc84a Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Mon, 11 Jun 2018 16:38:53 +0000 Subject: [PATCH 1/4] Accepting request 616092 from home:jordimassaguerpla:branch:dlg:golang-packaging_0_15_11 - Update to version 15.0.11: * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency OBS-URL: https://build.opensuse.org/request/show/616092 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=61 --- _service | 4 ++-- golang-packaging-15.0.10.tar.xz | 3 --- golang-packaging-15.0.11.tar.xz | 3 +++ golang-packaging.changes | 6 ++++++ golang-packaging.spec | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 golang-packaging-15.0.10.tar.xz create mode 100644 golang-packaging-15.0.11.tar.xz diff --git a/_service b/_service index 0fefdda..bb505b2 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ git golang-packaging .git - 15.0.10 - v15.0.10 + 15.0.11 + v15.0.11 enable diff --git a/golang-packaging-15.0.10.tar.xz b/golang-packaging-15.0.10.tar.xz deleted file mode 100644 index 3b25dcc..0000000 --- a/golang-packaging-15.0.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14964961feb384becc2942b43999a09ded930bae620ceb082413c0e1192ee49a -size 16452 diff --git a/golang-packaging-15.0.11.tar.xz b/golang-packaging-15.0.11.tar.xz new file mode 100644 index 0000000..6cc5e0b --- /dev/null +++ b/golang-packaging-15.0.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a16e0ed3a809cd8a8e98d1d4a42cd571c043c4909f5060bdda8b49d882d79b6 +size 16444 diff --git a/golang-packaging.changes b/golang-packaging.changes index bd00104..bd42af3 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 11 15:28:42 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 15.0.11: + * Replace rpmdev-vercmp by "sort -V" to remove rpmdev-vercmp dependency + ------------------------------------------------------------------- Thu May 31 15:24:50 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/golang-packaging.spec b/golang-packaging.spec index 17a8fb9..5e8d6ae 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 15.0.10 +Version: 15.0.11 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0-only From 0130dace3545826bd3ca01130777e02c458e5da6406731a2b83255621cd5b436 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Wed, 13 Jun 2018 08:32:57 +0000 Subject: [PATCH 2/4] Accepting request 616368 from home:michals:arduino - fix ppc64 (be) build. No pie baking support there. OBS-URL: https://build.opensuse.org/request/show/616368 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=62 --- golang-packaging.changes | 5 +++++ golang-packaging.spec | 2 ++ ppc64-nopie.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 ppc64-nopie.patch diff --git a/golang-packaging.changes b/golang-packaging.changes index bd42af3..8c68bd9 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 12 18:40:23 UTC 2018 - msuchanek@suse.com + +- fix ppc64 (be) build. No pie baking support there. + ------------------------------------------------------------------- Mon Jun 11 15:28:42 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/golang-packaging.spec b/golang-packaging.spec index 5e8d6ae..9832ad1 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -24,6 +24,7 @@ License: GPL-3.0-only Group: Development/Languages/Golang Url: https://github.com/openSUSE/%{name} Source: %{name}-%{version}.tar.xz +Patch: ppc64-nopie.patch BuildRequires: rpm BuildRequires: xz @@ -37,6 +38,7 @@ 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 new file mode 100644 index 0000000..c5dfc94 --- /dev/null +++ b/ppc64-nopie.patch @@ -0,0 +1,15 @@ +--- 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 From 414e540773b9f9aae070651535739acde963a45438c0109ed226f7f56077b197 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Wed, 13 Jun 2018 11:08:45 +0000 Subject: [PATCH 3/4] Accepting request 616501 from home:jordimassaguerpla:branch:d:l:g:fix_rpmdev_req - 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. OBS-URL: https://build.opensuse.org/request/show/616501 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=63 --- golang-packaging.changes | 7 +++++++ golang-packaging.spec | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/golang-packaging.changes b/golang-packaging.changes index 8c68bd9..61d42a5 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Tue Jun 12 18:40:23 UTC 2018 - msuchanek@suse.com diff --git a/golang-packaging.spec b/golang-packaging.spec index 9832ad1..275ee21 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -29,7 +29,6 @@ Patch: ppc64-nopie.patch BuildRequires: rpm BuildRequires: xz Requires: go -Requires: rpmdevtools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From cb4dd2324d6508fe21f50b939a80246dfea6e3aa690773c9cee0004ddb430c53 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Wed, 13 Jun 2018 11:43:34 +0000 Subject: [PATCH 4/4] Accepting request 616499 from home:michals:arduino + ppc64-nopie.patch OBS-URL: https://build.opensuse.org/request/show/616499 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=64 --- golang-packaging.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/golang-packaging.changes b/golang-packaging.changes index 61d42a5..e49c7e8 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -9,6 +9,7 @@ Wed Jun 13 11:02:18 UTC 2018 - jmassaguerpla@suse.com Tue Jun 12 18:40:23 UTC 2018 - msuchanek@suse.com - fix ppc64 (be) build. No pie baking support there. + + ppc64-nopie.patch ------------------------------------------------------------------- Mon Jun 11 15:28:42 UTC 2018 - opensuse-packaging@opensuse.org