From 66a063602c05093b302dc1fe9aabf3e4a8b79c42 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Aug 05 2020 16:09:34 +0000
Subject: Update to 1.0.0


Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index b2fc862..62f1cca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /macaroon-ab101776739ee61baab9bc50e4b33b5aeb3ac843.tar.gz
+/macaroon-1.0.0.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..d91b437
--- /dev/null
+++ b/0001-Convert-int-to-string-using-rune.patch
@@ -0,0 +1,31 @@
+From 49a6b70c987eef901d62f2ba51bd6c1b333abfe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Wed, 5 Aug 2020 18:03:19 +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
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ packet_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packet_test.go b/packet_test.go
+index 7ac9067..969774a 100644
+--- a/packet_test.go
++++ b/packet_test.go
+@@ -154,7 +154,7 @@ func truncate(d string) string {
+ 
+ func (*packetSuite) TestAsciiHex(c *gc.C) {
+ 	for b := 0; b < 256; b++ {
+-		n, err := strconv.ParseInt(string(b), 16, 8)
++		n, err := strconv.ParseInt(string(rune(b)), 16, 8)
+ 		value, ok := asciiHex(byte(b))
+ 		if err != nil || unicode.IsUpper(rune(b)) {
+ 			c.Assert(ok, gc.Equals, false)
+-- 
+2.26.2
+
diff --git a/golang-gopkg-macaroon-1.spec b/golang-gopkg-macaroon-1.spec
index 734467c..9f4c545 100644
--- a/golang-gopkg-macaroon-1.spec
+++ b/golang-gopkg-macaroon-1.spec
@@ -4,18 +4,10 @@
 # https://github.com/go-macaroon/macaroon
 %global goipath         gopkg.in/macaroon.v1
 %global forgeurl        https://github.com/go-macaroon/macaroon
-Version:                1
-%global commit          ab101776739ee61baab9bc50e4b33b5aeb3ac843
+Version:                1.0.0
 
 %gometa
 
-# Remove in F33
-%global godevelheader %{expand:
-Obsoletes:      golang-gopkg-go-macaroon-macaroon < 1-0.8
-Obsoletes:      golang-gopkg-go-macaroon-macaroon-devel < 1-0.8
-Obsoletes:      golang-gopkg-go-macaroon-macaroon-unit-test-devel < 1-0.8
-}
-
 %global common_description %{expand:
 The Macaroon package implements macaroons as described in the paper "Macaroons:
 Cookies with Contextual Caveats for Decentralized Authorization in the Cloud"
@@ -25,13 +17,15 @@ Cookies with Contextual Caveats for Decentralized Authorization in the Cloud"
 %global godocs          README.md TODO
 
 Name:           %{goname}
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Native Go implementation of macaroons
 
 # Upstream license specification: BSD-3-Clause
 License:        BSD
 URL:            %{gourl}
 Source0:        %{gosource}
+# Go 1.15: https://github.com/golang/go/issues/32479
+Patch0:         0001-Convert-int-to-string-using-rune.patch
 
 BuildRequires:  golang(golang.org/x/crypto/nacl/secretbox)
 
@@ -47,6 +41,7 @@ BuildRequires:  golang(gopkg.in/check.v1)
 
 %prep
 %goprep
+%patch0 -p1
 
 %install
 %gopkginstall
@@ -59,6 +54,9 @@ BuildRequires:  golang(gopkg.in/check.v1)
 %gopkgfiles
 
 %changelog
+* Wed Aug 05 17:55:28 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.0-1
+- Update to 1.0.0
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-6
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index d4441be..1d4e500 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (macaroon-ab101776739ee61baab9bc50e4b33b5aeb3ac843.tar.gz) = 819c14c4b3c4afbda3bad62c51242d1935ff9d290d6a7acd5402fa1cd4596ff120cb3eab3ddd57ffdc57eba03bd8041a2f3ae55db14cd37910abccb2a3a02abc
+SHA512 (macaroon-1.0.0.tar.gz) = f6b854ac6302fd7bba33aaaad278f3c6a95caaa33065061e29f880e8f8f3e281fdeffaa06b88ce7ed40cf67dfaea85b981f0275df2d00f4426186b28a930148b