From bddb391fb04597bd268160ddeded67e156e7b904 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Dec 20 2020 07:18:51 +0000 Subject: Update to 1.1.5 Close: rhbz#1819482 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index abc144e..7188aa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /go-msgpack-0.5.4.tar.gz /go-msgpack-0.5.5.tar.gz +/go-msgpack-1.1.5.tar.gz diff --git a/0001-Bypass-flag.Parse-in-init.patch b/0001-Bypass-flag.Parse-in-init.patch deleted file mode 100644 index 52aa124..0000000 --- a/0001-Bypass-flag.Parse-in-init.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up go-msgpack-0.5.5/codec/z_helper_test.go.orig go-msgpack-0.5.5/codec/z_helper_test.go ---- go-msgpack-0.5.5/codec/z_helper_test.go.orig 2019-05-02 16:51:04.000000000 +0200 -+++ go-msgpack-0.5.5/codec/z_helper_test.go 2020-01-31 17:57:19.707145851 +0100 -@@ -16,6 +16,11 @@ import ( - "testing" - ) - -+var _ = func() bool { -+ testing.Init() -+ return true -+}() -+ - var ( - testLogToT = true - failNowOnFail = true diff --git a/golang-github-hashicorp-msgpack.spec b/golang-github-hashicorp-msgpack.spec index b094cbf..7910024 100644 --- a/golang-github-hashicorp-msgpack.spec +++ b/golang-github-hashicorp-msgpack.spec @@ -3,26 +3,21 @@ # https://github.com/hashicorp/go-msgpack %global goipath github.com/hashicorp/go-msgpack -Version: 0.5.5 +Version: 1.1.5 %gometa -# Remove in F33: -%global godevelheader %{expand: -Obsoletes: golang-github-hashicorp-go-msgpack-devel < 0-0.16 -} - %global common_description %{expand: Package Codec provides a High Performance, Feature-Rich Idiomatic Go 1.4+ codec/encoding library for binc, msgpack, cbor, json.} %global golicenses LICENSE -%global godocs README.md msgpack.org.md README-codec.md +%global godocs README.md msgpack.org.md %global gosupfiles glide.lock glide.yaml Name: %{goname} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Codec/encoding library for binc, msgpack, cbor, json # Upstream license specification: BSD-3-Clause @@ -31,7 +26,13 @@ URL: %{gourl} Source0: %{gosource} Source1: glide.yaml Source2: glide.lock -Patch0: 0001-Bypass-flag.Parse-in-init.patch + +BuildRequires: golang(golang.org/x/tools/go/packages) + +%if %{with check} +# Tests +BuildRequires: golang(github.com/ugorji/go/codec) +%endif %description %{common_description} @@ -40,10 +41,6 @@ Patch0: 0001-Bypass-flag.Parse-in-init.patch %prep %goprep -%patch0 -p1 -mv codec/README.md README-codec.md -# Avoid error in %check because of the double commented line -sed -i "s|// //+build ignore|//+build ignore|" codec/ext_dep_test.go cp %{S:1} %{S:2} . %install @@ -51,12 +48,16 @@ cp %{S:1} %{S:2} . %if %{with check} %check -%gocheck +%gocheck -d codec/bench %endif %gopkgfiles %changelog +* Sun Dec 20 07:37:41 CET 2020 Robert-André Mauchin - 1.1.5-1 +- Update to 1.1.5 +- Close: rhbz#1819482 + * Sat Aug 01 2020 Fedora Release Engineering - 0.5.5-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a20d76e..149d8be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go-msgpack-0.5.5.tar.gz) = 956fb5839348587bc85385a2d822824001b5f08ab30c5e3fb5f82c1536021c8e2b429a736e04ffd6b338e7128caba63284cf9cae955451aa8444615937754cfc +SHA512 (go-msgpack-1.1.5.tar.gz) = 58b6be3802a799ca64551bb584111b98d3aa6b1b67102764e134dcb930a08c191f76ac877744b81288762e5107d7da7c0155c70260cd13be4f81ba7bc22d8fc9