diff --git a/.gitignore b/.gitignore index 55f7c47..7ae88f0 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /hugo-0.98.0.tar.gz /hugo-0.101.0.tar.gz /hugo-0.109.0.tar.gz +/hugo-0.111.3.tar.gz diff --git a/0020-clbanning-mxj.patch b/0020-clbanning-mxj.patch index 182923e..af27b77 100644 --- a/0020-clbanning-mxj.patch +++ b/0020-clbanning-mxj.patch @@ -1,8 +1,8 @@ -diff -u --recursive hugo-0.109.0-vanilla/go.mod hugo-0.109.0/go.mod ---- hugo-0.109.0-vanilla/go.mod 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/go.mod 2023-01-11 11:52:01.180950687 -0600 -@@ -15,7 +15,7 @@ - github.com/bep/gowebp v0.2.0 +diff -u --recursive hugo-0.111.3-vanilla/go.mod hugo-0.111.3/go.mod +--- hugo-0.111.3-vanilla/go.mod 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/go.mod 2023-05-14 13:56:23.960785402 -0500 +@@ -16,7 +16,7 @@ + github.com/bep/lazycache v0.2.0 github.com/bep/overlayfs v0.6.0 github.com/bep/tmc v0.5.1 - github.com/clbanning/mxj/v2 v2.5.7 @@ -10,11 +10,10 @@ diff -u --recursive hugo-0.109.0-vanilla/go.mod hugo-0.109.0/go.mod github.com/cli/safeexec v1.0.0 github.com/disintegration/gift v1.2.1 github.com/dustin/go-humanize v1.0.0 -Only in hugo-0.109.0/: .go.mod.swp -diff -u --recursive hugo-0.109.0-vanilla/go.sum hugo-0.109.0/go.sum ---- hugo-0.109.0-vanilla/go.sum 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/go.sum 2023-01-11 11:52:22.109768435 -0600 -@@ -193,8 +193,8 @@ +diff -u --recursive hugo-0.111.3-vanilla/go.sum hugo-0.111.3/go.sum +--- hugo-0.111.3-vanilla/go.sum 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/go.sum 2023-05-14 13:56:38.784639997 -0500 +@@ -195,8 +195,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -25,9 +24,9 @@ diff -u --recursive hugo-0.109.0-vanilla/go.sum hugo-0.109.0/go.sum github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI= github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -diff -u --recursive hugo-0.109.0-vanilla/parser/frontmatter.go hugo-0.109.0/parser/frontmatter.go ---- hugo-0.109.0-vanilla/parser/frontmatter.go 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/parser/frontmatter.go 2023-01-11 11:52:32.612676975 -0600 +diff -u --recursive hugo-0.111.3-vanilla/parser/frontmatter.go hugo-0.111.3/parser/frontmatter.go +--- hugo-0.111.3-vanilla/parser/frontmatter.go 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/parser/frontmatter.go 2023-05-14 13:56:53.511495544 -0500 @@ -24,7 +24,7 @@ yaml "gopkg.in/yaml.v2" @@ -37,9 +36,9 @@ diff -u --recursive hugo-0.109.0-vanilla/parser/frontmatter.go hugo-0.109.0/pars ) const ( -diff -u --recursive hugo-0.109.0-vanilla/parser/metadecoders/decoder.go hugo-0.109.0/parser/metadecoders/decoder.go ---- hugo-0.109.0-vanilla/parser/metadecoders/decoder.go 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/parser/metadecoders/decoder.go 2023-01-11 11:52:50.173524050 -0600 +diff -u --recursive hugo-0.111.3-vanilla/parser/metadecoders/decoder.go hugo-0.111.3/parser/metadecoders/decoder.go +--- hugo-0.111.3-vanilla/parser/metadecoders/decoder.go 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/parser/metadecoders/decoder.go 2023-05-14 13:57:05.633376639 -0500 @@ -24,7 +24,7 @@ "github.com/gohugoio/hugo/common/herrors" "github.com/niklasfasching/go-org/org" diff --git a/0030-nicksnyder-go-i18n.patch b/0030-nicksnyder-go-i18n.patch index 959bccf..0b6f20d 100644 --- a/0030-nicksnyder-go-i18n.patch +++ b/0030-nicksnyder-go-i18n.patch @@ -1,7 +1,7 @@ -diff -u --recursive hugo-0.109.0-vanilla/go.mod hugo-0.109.0/go.mod ---- hugo-0.109.0-vanilla/go.mod 2023-01-11 11:52:01.180950687 -0600 -+++ hugo-0.109.0/go.mod 2023-01-11 12:06:35.877345025 -0600 -@@ -27,7 +27,7 @@ +diff -u --recursive hugo-0.111.3-vanilla/go.mod hugo-0.111.3/go.mod +--- hugo-0.111.3-vanilla/go.mod 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/go.mod 2023-05-14 13:58:42.855422989 -0500 +@@ -28,7 +28,7 @@ github.com/ghodss/yaml v1.0.0 github.com/gobuffalo/flect v0.3.0 github.com/gobwas/glob v0.2.3 @@ -10,11 +10,10 @@ diff -u --recursive hugo-0.109.0-vanilla/go.mod hugo-0.109.0/go.mod github.com/gohugoio/locales v0.14.0 github.com/gohugoio/localescompressed v1.0.1 github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95 -Only in hugo-0.109.0-vanilla/: .go.mod.swp -diff -u --recursive hugo-0.109.0-vanilla/go.sum hugo-0.109.0/go.sum ---- hugo-0.109.0-vanilla/go.sum 2023-01-11 11:52:22.109768435 -0600 -+++ hugo-0.109.0/go.sum 2023-01-11 12:07:32.085856700 -0600 -@@ -280,8 +280,8 @@ +diff -u --recursive hugo-0.111.3-vanilla/go.sum hugo-0.111.3/go.sum +--- hugo-0.111.3-vanilla/go.sum 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/go.sum 2023-05-14 13:59:02.688228448 -0500 +@@ -282,8 +282,8 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -25,21 +24,21 @@ diff -u --recursive hugo-0.109.0-vanilla/go.sum hugo-0.109.0/go.sum github.com/gohugoio/locales v0.14.0 h1:Q0gpsZwfv7ATHMbcTNepFd59H7GoykzWJIxi113XGDc= github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4= github.com/gohugoio/localescompressed v1.0.1 h1:KTYMi8fCWYLswFyJAeOtuk/EkXR/KPTHHNN9OS+RTxo= -diff -u --recursive hugo-0.109.0-vanilla/langs/i18n/i18n.go hugo-0.109.0/langs/i18n/i18n.go ---- hugo-0.109.0-vanilla/langs/i18n/i18n.go 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/langs/i18n/i18n.go 2023-01-11 12:08:02.180595264 -0600 -@@ -25,7 +25,7 @@ - "github.com/gohugoio/hugo/config" +diff -u --recursive hugo-0.111.3-vanilla/langs/i18n/i18n.go hugo-0.111.3/langs/i18n/i18n.go +--- hugo-0.111.3-vanilla/langs/i18n/i18n.go 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/langs/i18n/i18n.go 2023-05-14 13:59:22.567033455 -0500 +@@ -27,7 +27,7 @@ "github.com/gohugoio/hugo/helpers" + "github.com/gohugoio/hugo/resources/page" - "github.com/gohugoio/go-i18n/v2/i18n" + "github.com/nicksnyder/go-i18n/v2/i18n" ) - type translateFunc func(translationID string, templateData any) string -diff -u --recursive hugo-0.109.0-vanilla/langs/i18n/translationProvider.go hugo-0.109.0/langs/i18n/translationProvider.go ---- hugo-0.109.0-vanilla/langs/i18n/translationProvider.go 2022-12-23 04:38:11.000000000 -0600 -+++ hugo-0.109.0/langs/i18n/translationProvider.go 2023-01-11 12:09:13.298977398 -0600 + type translateFunc func(ctx context.Context, translationID string, templateData any) string +diff -u --recursive hugo-0.111.3-vanilla/langs/i18n/translationProvider.go hugo-0.111.3/langs/i18n/translationProvider.go +--- hugo-0.111.3-vanilla/langs/i18n/translationProvider.go 2023-03-12 06:40:50.000000000 -0500 ++++ hugo-0.111.3/langs/i18n/translationProvider.go 2023-05-14 13:59:39.406868272 -0500 @@ -24,7 +24,7 @@ "golang.org/x/text/language" yaml "gopkg.in/yaml.v2" diff --git a/hugo.spec b/hugo.spec index 84ececa..978a862 100644 --- a/hugo.spec +++ b/hugo.spec @@ -19,7 +19,7 @@ # https://github.com/gohugoio/hugo %global goipath github.com/gohugoio/hugo -Version: 0.109.0 +Version: 0.111.3 %gometa -f @@ -69,9 +69,9 @@ Recommends: golang-bin %prep %goprep -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1 +%patch 0001 -p1 +%patch 0002 -p1 +%patch 0003 -p1 # Replace blackfriday import path to avoid conflict with v2 sed -i \ @@ -120,8 +120,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1 # hugolib: We should run this one, but it presently fails. # langs/i18n: Patched gohugoio/go-i18n/ back to nicksnyder/go-i18n. # markup/goldmark/codeblocks: We should run this one, but it presently fails. -# resources/resource_transformers/js: error message formats have changed. -%gocheck -d releaser -d tpl/time -d common/herrors -d common/text -d deploy -d hugolib -d langs/i18n -d markup/goldmark/codeblocks -d resources/resource_transformers/js +# resources/resource_transformers/js: Error message formats have changed. +# resources/resource_factories/create: Now fails with latest Rawhide dependencies. +%gocheck -d releaser -d tpl/time -d common/herrors -d common/text -d deploy -d hugolib -d langs/i18n -d markup/goldmark/codeblocks -d resources/resource_transformers/js -d resources/resource_factories/create %endif %files diff --git a/sources b/sources index dba7c5f..2e77ed1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hugo-0.109.0.tar.gz) = 19168f7a27da94dc00195457b12f335a279304111f14c9bab8abae0b1fab6928260bad1d7022d2083ba48268b1e660fc72592b99be43bd64403e05917a9b436f +SHA512 (hugo-0.111.3.tar.gz) = fd9fa9138cf714572d50328abc332edcdaaa3d45440914705d0d2119fd2a062c8df59732d9f5c23f540076e0c5a4104ac1d332f8633d93ab1479f82dd5ecce39