rpms
/
hugo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.109.0 (rhbz#1930952) 

- Use %gometa -f due to use in dependencies
- Restore some tests that work with the latest Fedora packages

Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo 2023-01-12 10:43:01 -06:00
parent 00486392df
commit fc27713881
3 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0020-clbanning-mxj.patch
View File

@ -1,32 +1,33 @@
diff -u --recursive hugo-0.101.0-vanilla/go.mod hugo-0.101.0/go.mod
--- hugo-0.101.0-vanilla/go.mod 2022-06-16 02:09:16.000000000 -0500
+++ hugo-0.101.0/go.mod 2022-08-02 18:02:52.200103077 -0500
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.1.0
github.com/bep/gowebp v0.2.0
github.com/bep/overlayfs v0.6.0
github.com/bep/tmc v0.5.1
- github.com/clbanning/mxj/v2 v2.5.6
+ github.com/clbanning/mxj v2.5.6
- github.com/clbanning/mxj/v2 v2.5.7
+ github.com/clbanning/mxj v2.5.7
github.com/cli/safeexec v1.0.0
github.com/disintegration/gift v1.2.1
github.com/dustin/go-humanize v1.0.0
diff -u --recursive hugo-0.101.0-vanilla/go.sum hugo-0.101.0/go.sum
--- hugo-0.101.0-vanilla/go.sum 2022-06-16 02:09:16.000000000 -0500
+++ hugo-0.101.0/go.sum 2022-08-02 18:03:03.506004512 -0500
@@ -194,8 +194,8 @@
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 @@
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=
-github.com/clbanning/mxj/v2 v2.5.6 h1:Jm4VaCI/+Ug5Q57IzEoZbwx4iQFA6wkXv72juUSeK+g=
-github.com/clbanning/mxj/v2 v2.5.6/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/clbanning/mxj v2.5.6 h1:Jm4VaCI/+Ug5Q57IzEoZbwx4iQFA6wkXv72juUSeK+g=
+github.com/clbanning/mxj v2.5.6/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
-github.com/clbanning/mxj/v2 v2.5.7 h1:7q5lvUpaPF/WOkqgIDiwjBJaznaLCCBd78pi8ZyAnE0=
-github.com/clbanning/mxj/v2 v2.5.7/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/clbanning/mxj v2.5.7 h1:7q5lvUpaPF/WOkqgIDiwjBJaznaLCCBd78pi8ZyAnE0=
+github.com/clbanning/mxj v2.5.7/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
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.101.0-vanilla/parser/frontmatter.go hugo-0.101.0/parser/frontmatter.go
--- hugo-0.101.0-vanilla/parser/frontmatter.go 2022-06-16 02:09:16.000000000 -0500
+++ hugo-0.101.0/parser/frontmatter.go 2022-08-02 18:03:24.141824608 -0500
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
@@ -24,7 +24,7 @@
yaml "gopkg.in/yaml.v2"
@ -36,9 +37,9 @@ diff -u --recursive hugo-0.101.0-vanilla/parser/frontmatter.go hugo-0.101.0/pars
)
const (
diff -u --recursive hugo-0.101.0-vanilla/parser/metadecoders/decoder.go hugo-0.101.0/parser/metadecoders/decoder.go
--- hugo-0.101.0-vanilla/parser/metadecoders/decoder.go 2022-06-16 02:09:16.000000000 -0500
+++ hugo-0.101.0/parser/metadecoders/decoder.go 2022-08-02 18:03:39.189693421 -0500
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
@@ -24,7 +24,7 @@
"github.com/gohugoio/hugo/common/herrors"
"github.com/niklasfasching/go-org/org"
@ -47,4 +48,4 @@ diff -u --recursive hugo-0.101.0-vanilla/parser/metadecoders/decoder.go hugo-0.1
+ xml "github.com/clbanning/mxj"
toml "github.com/pelletier/go-toml/v2"
"github.com/spf13/afero"
"github.com/spf13/cast"
"github.com/spf13/cast"

33
0030-nicksnyder-go-i18n.patch
View File

@ -1,19 +1,20 @@
diff -u --recursive hugo-0.98.0-vanilla/go.mod hugo-0.98.0/go.mod
--- hugo-0.98.0-vanilla/go.mod 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/go.mod 2022-06-09 18:33:06.660140035 -0500
@@ -26,7 +26,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 @@
github.com/ghodss/yaml v1.0.0
github.com/gobuffalo/flect v0.2.5
github.com/gobuffalo/flect v0.3.0
github.com/gobwas/glob v0.2.3
- github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013
+ github.com/nicksnyder/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013
github.com/gohugoio/locales v0.14.0
github.com/gohugoio/localescompressed v1.0.1
github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95
diff -u --recursive hugo-0.98.0-vanilla/go.sum hugo-0.98.0/go.sum
--- hugo-0.98.0-vanilla/go.sum 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/go.sum 2022-06-09 18:33:23.678116377 -0500
@@ -328,8 +328,8 @@
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 @@
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=
@ -24,9 +25,9 @@ diff -u --recursive hugo-0.98.0-vanilla/go.sum hugo-0.98.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.98.0-vanilla/langs/i18n/i18n.go hugo-0.98.0/langs/i18n/i18n.go
--- hugo-0.98.0-vanilla/langs/i18n/i18n.go 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/langs/i18n/i18n.go 2022-06-09 18:34:19.650038594 -0500
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"
"github.com/gohugoio/hugo/helpers"
@ -36,10 +37,10 @@ diff -u --recursive hugo-0.98.0-vanilla/langs/i18n/i18n.go hugo-0.98.0/langs/i18
)
type translateFunc func(translationID string, templateData any) string
diff -u --recursive hugo-0.98.0-vanilla/langs/i18n/translationProvider.go hugo-0.98.0/langs/i18n/translationProvider.go
--- hugo-0.98.0-vanilla/langs/i18n/translationProvider.go 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/langs/i18n/translationProvider.go 2022-06-09 18:34:33.721019076 -0500
@@ -23,7 +23,7 @@
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
@@ -24,7 +24,7 @@
"golang.org/x/text/language"
yaml "gopkg.in/yaml.v2"

12
hugo.spec
View File

@ -19,9 +19,9 @@
# https://github.com/gohugoio/hugo
%global goipath github.com/gohugoio/hugo
Version: 0.101.0
Version: 0.109.0
%gometa
%gometa -f
%global common_description %{expand:
Hugo is a static HTML and CSS website generator written in Go. It is optimized
@ -118,14 +118,10 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1
# common/text: Terminal colors seem to affect this test.
# deploy: We do not want to test deployment process.
# hugolib: We should run this one, but it presently fails.
# markup/goldmark/codeblocks: We should run this one, but it presently fails.
# markup/goldmark: We should run this one, but it presently fails.
# langs/i18n: Patched gohugoio/go-i18n/ back to nicksnyder/go-i18n.
# metrics: produces wrong quote.
# minifiers: produces wrong quote.
# resources/page: fails on ppc64le
# 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 markup/goldmark/codeblocks -d markup/goldmark -d langs/i18n -d metrics -d minifiers -d resources/page -d resources/resource_transformers/js
%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
%endif
%files