From 4d9d39403140fbd07bfeac1fc09f22d296ea56bd Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 1 Mar 2019 18:59:48 -0500 Subject: [PATCH] Add fix for new emoji test results. --- ...x-tests-against-latest-emoji-package.patch | 54 +++++++++++++++++++ hugo.spec | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 0001-Fix-tests-against-latest-emoji-package.patch diff --git a/0001-Fix-tests-against-latest-emoji-package.patch b/0001-Fix-tests-against-latest-emoji-package.patch new file mode 100644 index 0000000..2c51e95 --- /dev/null +++ b/0001-Fix-tests-against-latest-emoji-package.patch @@ -0,0 +1,54 @@ +From 8f25792a159f13f11e742d255df589f7e8b18d24 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Fri, 1 Mar 2019 18:47:19 -0500 +Subject: [PATCH] Fix tests against latest emoji package. + +Signed-off-by: Elliott Sales de Andrade +--- + docs/data/docs.json | 2 +- + tpl/transform/init.go | 2 +- + tpl/transform/transform_test.go | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/data/docs.json b/docs/data/docs.json +index 6400900a..1c0b94e7 100644 +--- a/docs/data/docs.json ++++ b/docs/data/docs.json +@@ -3475,7 +3475,7 @@ + "Examples": [ + [ + "{{ \"I :heart: Hugo\" | emojify }}", +- "I ❤️ Hugo" ++ "I ❤ Hugo" + ] + ] + }, +diff --git a/tpl/transform/init.go b/tpl/transform/init.go +index 86951c25..898d3ea9 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 ab3beb80..ee5da725 100644 +--- a/tpl/transform/transform_test.go ++++ b/tpl/transform/transform_test.go +@@ -41,7 +41,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.20.1 + diff --git a/hugo.spec b/hugo.spec index 5c9db26..48921e5 100644 --- a/hugo.spec +++ b/hugo.spec @@ -12,6 +12,10 @@ URL: %{gourl} Source0: %{gosource} # Call rst2html directly instead of via 'python'. Patch0001: https://github.com/gohugoio/hugo/pull/5285.patch +%if %{?fedora} > 29 +# Fix build against golang-github-kyokomi-emoji 2.1 +Patch0002: 0001-Fix-tests-against-latest-emoji-package.patch +%endif %description Hugo is a static HTML and CSS website generator written in Go. It is optimized