From b98b2f512bfdfb5295b7ef2583e3c9faa5839b58 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Aug 04 2020 15:51:52 +0000 Subject: Update to 0.23.1 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 82c87da..76b3da8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /govmomi-0.20.0.tar.gz /govmomi-0.21.0.tar.gz +/govmomi-0.23.1.tar.gz diff --git a/0001-Convert-int-to-string-using-rune.patch b/0001-Convert-int-to-string-using-rune.patch new file mode 100644 index 0000000..c848b8d --- /dev/null +++ b/0001-Convert-int-to-string-using-rune.patch @@ -0,0 +1,42 @@ +From c65810c8cb065b69c4f817d026fc3f04d8c19af8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Tue, 4 Aug 2020 17:38:53 +0200 +Subject: [PATCH] Convert int to string using rune() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://github.com/golang/go/issues/32479 + +Fix #2075. + +Signed-off-by: Robert-André Mauchin +--- + vim25/xml/xml.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vim25/xml/xml.go b/vim25/xml/xml.go +index 50117a00..a881c608 100644 +--- a/vim25/xml/xml.go ++++ b/vim25/xml/xml.go +@@ -1056,7 +1056,7 @@ Input: + d.buf.WriteByte(';') + n, err := strconv.ParseUint(s, base, 64) + if err == nil && n <= unicode.MaxRune { +- text = string(n) ++ text = string(rune(n)) + haveText = true + } + } +@@ -1078,7 +1078,7 @@ Input: + if isName(name) { + s := string(name) + if r, ok := entity[s]; ok { +- text = string(r) ++ text = string(rune(r)) + haveText = true + } else if d.Entity != nil { + text, haveText = d.Entity[s] +-- +2.26.2 + diff --git a/golang-github-vmware-govmomi.spec b/golang-github-vmware-govmomi.spec index 73fccb9..7d681bb 100644 --- a/golang-github-vmware-govmomi.spec +++ b/golang-github-vmware-govmomi.spec @@ -8,7 +8,7 @@ # https://github.com/vmware/govmomi %global goipath github.com/vmware/govmomi -Version: 0.21.0 +Version: 0.23.1 %gometa @@ -22,13 +22,15 @@ A Go library for interacting with VMware vSphere APIs (ESXi and/or vCenter).} README-vcsim.md Name: %{goname} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Go library for the VMware vSphere API # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +# Go 1.15: https://github.com/vmware/govmomi/issues/2075 +Patch0: 0001-Convert-int-to-string-using-rune.patch BuildRequires: golang(github.com/davecgh/go-xdr/xdr2) BuildRequires: golang(github.com/google/uuid) @@ -43,6 +45,7 @@ BuildRequires: golang(github.com/vmware/vmw-guestinfo/vmcheck) %prep %goprep +%patch0 -p1 mv govc/README.md README-govc.md mv govc/CHANGELOG.md CHANGELOG-govc.md mv govc/USAGE.md USAGE-govc.md @@ -82,6 +85,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %gopkgfiles %changelog +* Tue Aug 04 17:25:08 CEST 2020 Robert-André Mauchin - 0.23.1-1 +- Update to 0.23.1 + * Sat Aug 01 2020 Fedora Release Engineering - 0.21.0-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 8777cc6..e706d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (govmomi-0.21.0.tar.gz) = 79dfb068aaad1149ea70d9875685e0bdcd27d04c8f8d74643f7d281029beb8345528ef76d38f8be47f350675fea34905f67bee16ba740182819ab236f01b324e +SHA512 (govmomi-0.23.1.tar.gz) = 8df06599d386d313359768c4ed868ba77e3a6b5f52d41bfba9312c186c30ea303154012f46899374779f130a8bed52341a236da7404fa845342ec9d49ef6cca7