Update to version 0.69.0

Signed-off-by: Athos Ribeiro <athoscr@fedoraproject.org>
This commit is contained in:
Athos Ribeiro 2020-04-18 10:56:37 +02:00
parent c47745455c
commit fe85840911
4 changed files with 7 additions and 77 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/hugo-0.65.2.tar.gz
/hugo-0.65.3.tar.gz
/hugo-0.68.3.tar.gz
/hugo-0.69.0.tar.gz

View File

@ -1,70 +0,0 @@
From 380e16e5e1330f383b75498b1d376cfa94270765 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 8 Apr 2020 06:06:03 -0400
Subject: [PATCH 2/2] Update to latest emoji package.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
go.mod | 2 +-
go.sum | 4 ++--
tpl/transform/init.go | 2 +-
tpl/transform/transform_test.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/go.mod b/go.mod
index 5c011d10..6ef686a1 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
github.com/gorilla/websocket v1.4.1
github.com/jdkato/prose v1.1.1
github.com/kr/pretty v0.2.0 // indirect
- github.com/kyokomi/emoji v2.1.0+incompatible
+ github.com/kyokomi/emoji v2.2.1+incompatible
github.com/magefile/mage v1.9.0
github.com/markbates/inflect v1.0.0
github.com/mattn/go-isatty v0.0.11
diff --git a/go.sum b/go.sum
index 583ba064..eb2affad 100644
--- a/go.sum
+++ b/go.sum
@@ -219,8 +219,8 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kyokomi/emoji v2.1.0+incompatible h1:+DYU2RgpI6OHG4oQkM5KlqD3Wd3UPEsX8jamTo1Mp6o=
-github.com/kyokomi/emoji v2.1.0+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
+github.com/kyokomi/emoji v2.2.1+incompatible h1:uP/6J5y5U0XxPh6fv8YximpVD1uMrshXG78I1+uF5SA=
+github.com/kyokomi/emoji v2.2.1+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE=
github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
diff --git a/tpl/transform/init.go b/tpl/transform/init.go
index 2783a513..62cb0a9c 100644
--- a/tpl/transform/init.go
+++ b/tpl/transform/init.go
@@ -32,7 +32,7 @@ func init() {
ns.AddMethodMapping(ctx.Emojify,
[]string{"emojify"},
[][2]string{
- {`{{ "I :heart: Hugo" | emojify }}`, `I ❤ Hugo`},
+ {`{{ "I :heart: Hugo" | emojify }}`, `I ❤️ Hugo`},
},
)
diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go
index d10ff585..b3f4206f 100644
--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
@@ -44,7 +44,7 @@ func TestEmojify(t *testing.T) {
expect interface{}
}{
{":notamoji:", template.HTML(":notamoji:")},
- {"I :heart: Hugo", template.HTML("I ❤ Hugo")},
+ {"I :heart: Hugo", template.HTML("I ❤️ Hugo")},
// errors
{tstNoStringer{}, false},
} {
--
2.21.1

View File

@ -4,7 +4,7 @@
# https://github.com/gohugoio/hugo
%global goipath github.com/gohugoio/hugo
Version: 0.68.3
Version: 0.69.0
%gometa
@ -17,7 +17,7 @@ and templates and renders them into a full HTML website.}
%global godocs docs examples README.md CONTRIBUTING.md
Name: hugo
Release: 2%{?dist}
Release: 1%{?dist}
Summary: The worlds fastest framework for building websites
# Upstream license specification: Apache-2.0 and MIT
@ -28,8 +28,6 @@ Source0: %{gosource}
Patch0001: https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch
# Fix error message that changed in gocloud.
Patch0002: 0001-Update-error-message.patch
# Update emoji test results
Patch0003: 0002-Update-to-latest-emoji-package.patch
BuildRequires: golang(github.com/alecthomas/chroma) >= 0.7.1
BuildRequires: golang(github.com/alecthomas/chroma/formatters/html)
@ -96,7 +94,6 @@ BuildRequires: golang(github.com/yuin/goldmark/renderer)
BuildRequires: golang(github.com/yuin/goldmark/renderer/html)
BuildRequires: golang(github.com/yuin/goldmark/text)
BuildRequires: golang(github.com/yuin/goldmark/util)
BuildRequires: golang(go.uber.org/atomic) >= 1.4.0
BuildRequires: golang(gocloud.dev/blob) >= 0.15.0
BuildRequires: golang(gocloud.dev/blob/azureblob)
BuildRequires: golang(gocloud.dev/blob/fileblob)
@ -137,7 +134,6 @@ BuildRequires: rubygem-asciidoctor
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
# Replace blackfriday import path to avoid conflict with v2
# Depend on unversioned tdewolff/minify until Go modules are supported in Fedora
@ -191,6 +187,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1
%changelog
* Sat Apr 18 2020 Athos Ribeiro <athoscr@fedoraproject.org> - 0.69.0-1
- Update to latest version
* Mon Apr 13 2020 Athos Ribeiro <athoscr@fedoraproject.org> - 0.68.3-2
- Build hugo with extended features for SCSS support

View File

@ -1 +1 @@
SHA512 (hugo-0.68.3.tar.gz) = 31df8d69fe21c52b6d0676c62c81d07bad45660d985d9942aaef15242eae747f12eaf5c78ca11ee92a354c110aacaa2e3bab816455ca5bafc9ea4d2f10cf058f
SHA512 (hugo-0.69.0.tar.gz) = 585d38b438f6a888c623b3fe84bb652613037acfdfe53df00e13fa6597cd67c18d587986a35ca67876345d2c601c765e67e5e0fad25ed10e8002c99a99654f8f