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

Update to 0.98.0 

Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo 2022-06-09 18:47:46 -05:00
parent 15fd06d363
commit 86793cc59d
3 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0020-clbanning-mxj.patch
View File

@ -1,22 +1,22 @@
diff -u --recursive hugo-0.93.1-vanilla/go.mod hugo-0.93.1/go.mod
--- hugo-0.93.1-vanilla/go.mod 2022-03-02 06:16:06.000000000 -0600
+++ hugo-0.93.1/go.mod 2022-03-03 19:42:11.279020797 -0600
@@ -15,7 +15,7 @@
github.com/bep/golibsass v1.0.0
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:31:54.293987909 -0500
@@ -14,7 +14,7 @@
github.com/bep/gowebp v0.1.0
github.com/bep/overlayfs v0.6.0
github.com/bep/tmc v0.5.1
- github.com/clbanning/mxj/v2 v2.5.5
+ github.com/clbanning/mxj v2.5.5
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.93.1-vanilla/go.sum hugo-0.93.1/go.sum
--- hugo-0.93.1-vanilla/go.sum 2022-03-02 06:16:06.000000000 -0600
+++ hugo-0.93.1/go.sum 2022-03-03 19:42:04.570073240 -0600
@@ -169,8 +169,8 @@
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:31:58.892499173 -0500
@@ -239,8 +239,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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E=
-github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/clbanning/mxj v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E=
@ -24,9 +24,9 @@ diff -u --recursive hugo-0.93.1-vanilla/go.sum hugo-0.93.1/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.93.1-vanilla/parser/frontmatter.go hugo-0.93.1/parser/frontmatter.go
--- hugo-0.93.1-vanilla/parser/frontmatter.go 2022-03-02 06:16:06.000000000 -0600
+++ hugo-0.93.1/parser/frontmatter.go 2022-03-03 19:41:48.795196549 -0600
diff -u --recursive hugo-0.98.0-vanilla/parser/frontmatter.go hugo-0.98.0/parser/frontmatter.go
--- hugo-0.98.0-vanilla/parser/frontmatter.go 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/parser/frontmatter.go 2022-06-09 18:32:05.767224675 -0500
@@ -24,7 +24,7 @@
yaml "gopkg.in/yaml.v2"
@ -36,9 +36,9 @@ diff -u --recursive hugo-0.93.1-vanilla/parser/frontmatter.go hugo-0.93.1/parser
)
const (
diff -u --recursive hugo-0.93.1-vanilla/parser/metadecoders/decoder.go hugo-0.93.1/parser/metadecoders/decoder.go
--- hugo-0.93.1-vanilla/parser/metadecoders/decoder.go 2022-03-02 06:16:06.000000000 -0600
+++ hugo-0.93.1/parser/metadecoders/decoder.go 2022-03-03 19:41:43.599237165 -0600
diff -u --recursive hugo-0.98.0-vanilla/parser/metadecoders/decoder.go hugo-0.98.0/parser/metadecoders/decoder.go
--- hugo-0.98.0-vanilla/parser/metadecoders/decoder.go 2022-04-28 05:23:30.000000000 -0500
+++ hugo-0.98.0/parser/metadecoders/decoder.go 2022-06-09 18:32:11.091217274 -0500
@@ -24,7 +24,7 @@
"github.com/gohugoio/hugo/common/herrors"
"github.com/niklasfasching/go-org/org"

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

@ -1,50 +1,50 @@
diff -u --recursive hugo-0.93.3-vanilla/go.mod hugo-0.93.3/go.mod
--- hugo-0.93.3-vanilla/go.mod 2022-03-08 04:15:27.000000000 -0600
+++ hugo-0.93.3/go.mod 2022-05-06 11:34:01.886145624 -0500
@@ -27,7 +27,7 @@
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 @@
github.com/ghodss/yaml v1.0.0
github.com/gobuffalo/flect v0.2.4
github.com/gobuffalo/flect v0.2.5
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/i18n 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 v0.15.0
github.com/gohugoio/localescompressed v1.0.1
github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95
diff -u --recursive hugo-0.93.3-vanilla/go.sum hugo-0.93.3/go.sum
--- hugo-0.93.3-vanilla/go.sum 2022-03-08 04:15:27.000000000 -0600
+++ hugo-0.93.3/go.sum 2022-05-06 11:33:55.850212750 -0500
@@ -259,8 +259,8 @@
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 @@
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=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013 h1:Nj29Qbkt0bZ/bJl8eccfxQp3NlU/0IW1v9eyYtQ53XQ=
-github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ=
+github.com/nicksnyder/go-i18n/v2/i18n v2.1.3-0.20210430103248-4c28c89f8013 h1:Nj29Qbkt0bZ/bJl8eccfxQp3NlU/0IW1v9eyYtQ53XQ=
+github.com/nicksnyder/go-i18n/v2/i18n v2.1.3-0.20210430103248-4c28c89f8013/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ=
+github.com/nicksnyder/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013 h1:Nj29Qbkt0bZ/bJl8eccfxQp3NlU/0IW1v9eyYtQ53XQ=
+github.com/nicksnyder/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ=
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 v0.15.0 h1:KG+mPzRdPs7eklbZ7KsIikzwvd4wcyA9vv2MniUrFQ8=
diff -u --recursive hugo-0.93.3-vanilla/langs/i18n/i18n.go hugo-0.93.3/langs/i18n/i18n.go
--- hugo-0.93.3-vanilla/langs/i18n/i18n.go 2022-03-08 04:15:27.000000000 -0600
+++ hugo-0.93.3/langs/i18n/i18n.go 2022-05-06 11:33:44.466339346 -0500
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
@@ -25,7 +25,7 @@
"github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/helpers"
- "github.com/gohugoio/go-i18n/v2/i18n"
+ i18n "github.com/nicksnyder/go-i18n/v2/i18n"
+ "github.com/nicksnyder/go-i18n/v2/i18n"
)
type translateFunc func(translationID string, templateData interface{}) string
diff -u --recursive hugo-0.93.3-vanilla/langs/i18n/translationProvider.go hugo-0.93.3/langs/i18n/translationProvider.go
--- hugo-0.93.3-vanilla/langs/i18n/translationProvider.go 2022-03-08 04:15:27.000000000 -0600
+++ hugo-0.93.3/langs/i18n/translationProvider.go 2022-05-06 11:33:37.417417734 -0500
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 @@
"golang.org/x/text/language"
yaml "gopkg.in/yaml.v2"
- "github.com/gohugoio/go-i18n/v2/i18n"
+ i18n "github.com/nicksnyder/go-i18n/v2/i18n"
+ "github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/gohugoio/hugo/helpers"
toml "github.com/pelletier/go-toml/v2"

5
hugo.spec
View File

@ -4,7 +4,7 @@
# https://github.com/gohugoio/hugo
%global goipath github.com/gohugoio/hugo
Version: 0.93.3
Version: 0.98.0
%gometa
@ -96,8 +96,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1
# 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.
%gocheck -d releaser -d tpl/time -d common/text -d deploy -d hugolib -d markup/goldmark/codeblocks -d langs/i18n
%gocheck -d releaser -d tpl/time -d common/text -d deploy -d hugolib -d markup/goldmark/codeblocks -d markup/goldmark -d langs/i18n
%endif