From 13182e795c3c00118ca6a7e271b33c9808f4f3e5 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Aug 15 2022 14:18:00 +0000 Subject: Update to 1.1.0 - Close: rhbz#2103069 --- diff --git a/.gitignore b/.gitignore index 55a01c6..06c5fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /fileutil-8595d0e19c1ed35857747aede58cb19a5a67bbab.tar.bz2 /fileutil-b2535a37172bf4601ebc9f64b3a0cbe5782c8e76.tar.bz2 +/fileutil-v1.1.0.tar.bz2 diff --git a/0001-Fix-Error-message-in-falloc-error.go.patch b/0001-Fix-Error-message-in-falloc-error.go.patch deleted file mode 100644 index 8c24501..0000000 --- a/0001-Fix-Error-message-in-falloc-error.go.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bf78cc6b875fd4923cbf1a8dbfb865b6835aa7f2 Mon Sep 17 00:00:00 2001 -From: eclipseo -Date: Sat, 8 Aug 2020 02:02:23 +0000 -Subject: [PATCH] Fix Error message in falloc/error.go -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In Go 1.15 rc 1, passing e to Sprintf directly results in an error: - - # modernc.org/fileutil/falloc - ./error.go:87:9: Sprintf format %s with arg e causes recursive Error method call - FAIL modernc.org/fileutil/falloc [build failed] - -Signed-off-by: Robert-André Mauchin ---- - falloc/error.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/falloc/error.go b/falloc/error.go -index 2827d1c..52b27eb 100644 ---- a/falloc/error.go -+++ b/falloc/error.go -@@ -84,7 +84,7 @@ func (e *EHeader) Error() string { - type ENullHandle string - - func (e ENullHandle) Error() string { -- return fmt.Sprintf("%s: access via null handle", e) -+ return fmt.Sprintf("%s: access via null handle", string(e)) - } - - // EOpen is a file/store open error. --- -2.26.2 - diff --git a/golang-modernc-fileutil.spec b/golang-modernc-fileutil.spec index 4a15208..e550a60 100644 --- a/golang-modernc-fileutil.spec +++ b/golang-modernc-fileutil.spec @@ -1,14 +1,12 @@ -# Generated by go2rpm -%ifnarch ppc64le s390x +# Generated by go2rpm 1.8.0 %bcond_without check -%endif +%global debug_package %{nil} # https://gitlab.com/cznic/fileutil %global goipath modernc.org/fileutil %global forgeurl https://gitlab.com/cznic/fileutil -Version: 1.0.0 -%global commit b2535a37172bf4601ebc9f64b3a0cbe5782c8e76 -%global distprefix %{nil} +Version: 1.1.0 +%global tag v1.1.0 %gometa @@ -22,23 +20,19 @@ Name: %{goname} Release: %autorelease Summary: File utility functions in Go -# Upstream license specification: BSD-3-Clause -License: BSD +License: BSD-3-Clause URL: %{gourl} -Source0: %{gosource} -# Go 1.15: -Patch0: 0001-Fix-Error-message-in-falloc-error.go.patch - -BuildRequires: golang(modernc.org/mathutil) +Source: %{gosource} -%description -%{common_description} +%description %{common_description} %gopkg %prep %goprep -%patch0 -p1 + +%generate_buildrequires +%go_generate_buildrequires %install %gopkginstall diff --git a/sources b/sources index 9721876..03d973b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fileutil-b2535a37172bf4601ebc9f64b3a0cbe5782c8e76.tar.bz2) = 016144c7cf748cb4404bf1bfcc018f0a5005c9eb559052d18777ee06502eb2cb132346b3e7a80fd447a311d00f0c07e37d14ba1d21c3909786c58b3b23daabf0 +SHA512 (fileutil-v1.1.0.tar.bz2) = b784152d365cf8157919dcc69569d5befa67f8b33c9992d2756550fbc0b1571b511e57672a8b3f94d9358030c791e139e59bf8c499c54c40920a189f7671ce2f