diff --git a/0001-Fix-tests-against-latest-emoji-package.patch b/0001-Fix-tests-against-latest-emoji-package.patch index 4da679d..09d23fd 100644 --- a/0001-Fix-tests-against-latest-emoji-package.patch +++ b/0001-Fix-tests-against-latest-emoji-package.patch @@ -1,4 +1,4 @@ -From b1373ca1d5813cdefe505cc8d535674e6e6647d6 Mon Sep 17 00:00:00 2001 +From 08194c053448050910e3875065e7aa29c760e971 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. @@ -11,10 +11,10 @@ Signed-off-by: Elliott Sales de Andrade 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/data/docs.json b/docs/data/docs.json -index 4a68378a..ce732d1b 100644 +index 03bb0357..1f21646f 100644 --- a/docs/data/docs.json +++ b/docs/data/docs.json -@@ -4060,7 +4060,7 @@ +@@ -4109,7 +4109,7 @@ "Examples": [ [ "{{ \"I :heart: Hugo\" | emojify }}", @@ -37,10 +37,10 @@ index 62cb0a9c..2783a513 100644 ) diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go -index a09ec6fb..6db2272d 100644 +index 13c4bbc2..10b020a0 100644 --- a/tpl/transform/transform_test.go +++ b/tpl/transform/transform_test.go -@@ -41,7 +41,7 @@ func TestEmojify(t *testing.T) { +@@ -40,7 +40,7 @@ func TestEmojify(t *testing.T) { expect interface{} }{ {":notamoji:", template.HTML(":notamoji:")}, @@ -50,5 +50,5 @@ index a09ec6fb..6db2272d 100644 {tstNoStringer{}, false}, } { -- -2.20.1 +2.21.0 diff --git a/0005-skip-modules-TestClient.patch b/0005-skip-modules-TestClient.patch new file mode 100644 index 0000000..b98c979 --- /dev/null +++ b/0005-skip-modules-TestClient.patch @@ -0,0 +1,18 @@ +Description: Skip TestClient in modules/client_test.go + TestClient requires network access which is not allowed for Debian packaging. +Author: Anthony Fok +Origin: vendor +Forwarded: not-needed +Last-Update: 2019-08-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/modules/client_test.go ++++ b/modules/client_test.go +@@ -27,6 +27,7 @@ + ) + + func TestClient(t *testing.T) { ++ t.Skip("skip test as network access is not allowed during Debian package build") + if hugo.GoMinorVersion() < 12 { + // https://github.com/golang/go/issues/26794 + // There were some concurrent issues with Go modules in < Go 12. diff --git a/6385.patch b/6385.patch new file mode 100644 index 0000000..90e406d --- /dev/null +++ b/6385.patch @@ -0,0 +1,42 @@ +From d64e9611109b2eb6de42a47d497cba313252a838 Mon Sep 17 00:00:00 2001 +From: Anthony Fok +Date: Wed, 2 Oct 2019 23:40:22 -0600 +Subject: [PATCH] resources: Ensure same dirinfos sort order in + TestImageOperationsGolden + +Fix filename mismatch errors on Debian auto-building machines +possibly due to different directory order on ext4 vs tmpfs file systems. +--- + resources/image_test.go | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/resources/image_test.go b/resources/image_test.go +index 5fa5021c95..169f19522e 100644 +--- a/resources/image_test.go ++++ b/resources/image_test.go +@@ -15,6 +15,7 @@ package resources + + import ( + "fmt" ++ "io/ioutil" + "math/big" + "math/rand" + "os" +@@ -567,15 +568,9 @@ func TestImageOperationsGolden(t *testing.T) { + dir2 := filepath.FromSlash("testdata/golden") + + // The two dirs above should now be the same. +- d1, err := os.Open(dir1) ++ dirinfos1, err := ioutil.ReadDir(dir1) + c.Assert(err, qt.IsNil) +- d2, err := os.Open(dir2) +- c.Assert(err, qt.IsNil) +- +- dirinfos1, err := d1.Readdir(-1) +- c.Assert(err, qt.IsNil) +- dirinfos2, err := d2.Readdir(-1) +- ++ dirinfos2, err := ioutil.ReadDir(dir2) + c.Assert(err, qt.IsNil) + c.Assert(len(dirinfos1), qt.Equals, len(dirinfos2)) + diff --git a/6403.patch b/6403.patch new file mode 100644 index 0000000..d1e6b27 --- /dev/null +++ b/6403.patch @@ -0,0 +1,44 @@ +From e825481e553e5a2d60ccbd9930da9060d12cff3d Mon Sep 17 00:00:00 2001 +From: Anthony Fok +Date: Tue, 8 Oct 2019 23:46:04 -0600 +Subject: [PATCH] deps: Update minify to v2.5.2 + +- v2.5.1 removes import comments, solving a build error with Go 1.13 + in GOPATH mode (used Debian packaging for example) +- v2.5.2 no longer converts polyline/rect/polygon/line to path + as it has been reported to break a SVG referenced by CSS, + see tdewolff/minify#260 + +The test case for Min SVG in TestResourceChains is updated accordingly. + +Fixes pocc/tshark.dev#33 +--- + go.mod | 2 +- + go.sum | 12 ++++++------ + hugolib/resource_chain_test.go | 6 +++--- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go +index 138e7a4a28..10539d1bb2 100644 +--- a/hugolib/resource_chain_test.go ++++ b/hugolib/resource_chain_test.go +@@ -342,8 +342,8 @@ Min HTML: {{ ( resources.Get "mydata/html1.html" | resources.Minify ).Content | + b.AssertFileContent("public/index.html", `Min JS: var x;x=5;document.getElementById("demo").innerHTML=x*10;`) + b.AssertFileContent("public/index.html", `Min JSON: {"employees":[{"firstName":"John","lastName":"Doe"},{"firstName":"Anna","lastName":"Smith"},{"firstName":"Peter","lastName":"Jones"}]}`) + b.AssertFileContent("public/index.html", `Min XML: Hugo Rocks!`) +- b.AssertFileContent("public/index.html", `Min SVG: `) +- b.AssertFileContent("public/index.html", `Min SVG again: `) ++ b.AssertFileContent("public/index.html", `Min SVG: `) ++ b.AssertFileContent("public/index.html", `Min SVG again: `) + b.AssertFileContent("public/index.html", `Min HTML: Cool`) + }}, + +@@ -580,7 +580,7 @@ document.getElementById("demo").innerHTML = x * 10; + + b.WithSourceFile(filepath.Join("assets", "mydata", "svg1.svg"), ` + +- ++ + + `) + diff --git a/hugo.spec b/hugo.spec index d58b51c..621241f 100644 --- a/hugo.spec +++ b/hugo.spec @@ -1,8 +1,10 @@ %bcond_without check +# Some tests use a package that uses this. +%bcond_without bootstrap # https://github.com/gohugoio/hugo %global goipath github.com/gohugoio/hugo -Version: 0.55.6 +Version: 0.58.3 %gometa @@ -15,35 +17,46 @@ and templates and renders them into a full HTML website.} %global godocs docs examples README.md CONTRIBUTING.md Name: hugo -Release: 3%{?dist} -Summary: A Fast and Flexible Static Site Generator built with love in GoLang +Release: 1%{?dist} +Summary: The world’s fastest framework for building websites # Upstream license specification: Apache-2.0 and MIT License: ASL 2.0 and MIT URL: %{gourl} Source0: %{gosource} -%if %{?fedora} > 29 +# Skip test that uses the network. +Patch0001: https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch # Fix build against golang-github-kyokomi-emoji 2.1 Patch0002: 0001-Fix-tests-against-latest-emoji-package.patch -%endif +# Fix build against golang-github-tdewolff-minify 2.5.2 +Patch0003: https://github.com/gohugoio/hugo/pull/6403.patch +# Fix test susceptible to inconsistent directory order. +Patch0004: https://github.com/gohugoio/hugo/pull/6385.patch BuildRequires: golang(github.com/alecthomas/chroma) BuildRequires: golang(github.com/alecthomas/chroma/formatters) BuildRequires: golang(github.com/alecthomas/chroma/formatters/html) BuildRequires: golang(github.com/alecthomas/chroma/lexers) BuildRequires: golang(github.com/alecthomas/chroma/styles) +BuildRequires: golang(github.com/armon/go-radix) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/cloudfront) BuildRequires: golang(github.com/bep/debounce) BuildRequires: golang(github.com/bep/gitmap) BuildRequires: golang(github.com/bep/go-tocss/scss) +BuildRequires: golang(github.com/bep/tmc) BuildRequires: golang(github.com/BurntSushi/locker) BuildRequires: golang(github.com/BurntSushi/toml) -BuildRequires: golang(github.com/chaseadamsio/goorgeous) -BuildRequires: golang(github.com/disintegration/imaging) +BuildRequires: golang(github.com/disintegration/gift) +BuildRequires: golang(github.com/dustin/go-humanize) BuildRequires: golang(github.com/eknkc/amber) +BuildRequires: golang(github.com/frankban/quicktest) BuildRequires: golang(github.com/fsnotify/fsnotify) BuildRequires: golang(github.com/gobwas/glob) +BuildRequires: golang(github.com/gobwas/glob/syntax) +BuildRequires: golang(github.com/google/go-cmp/cmp) BuildRequires: golang(github.com/gorilla/websocket) -BuildRequires: golang(github.com/hashicorp/go-immutable-radix) BuildRequires: golang(github.com/jdkato/prose/transform) BuildRequires: golang(github.com/kyokomi/emoji) BuildRequires: golang(github.com/markbates/inflect) @@ -55,10 +68,14 @@ BuildRequires: golang(github.com/muesli/smartcrop) BuildRequires: golang(github.com/nicksnyder/go-i18n/i18n/bundle) BuildRequires: golang(github.com/nicksnyder/go-i18n/i18n/language) BuildRequires: golang(github.com/nicksnyder/go-i18n/i18n/translation) +BuildRequires: golang(github.com/niklasfasching/go-org/org) BuildRequires: golang(github.com/olekukonko/tablewriter) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/PuerkitoBio/purell) +BuildRequires: golang(github.com/rogpeppe/go-internal/module) BuildRequires: golang(gopkg.in/russross/blackfriday.v1) +BuildRequires: golang(github.com/rwcarlsen/goexif/exif) +BuildRequires: golang(github.com/rwcarlsen/goexif/tiff) BuildRequires: golang(github.com/spf13/afero) BuildRequires: golang(github.com/spf13/cast) BuildRequires: golang(github.com/spf13/cobra) @@ -75,8 +92,16 @@ BuildRequires: (golang(github.com/tdewolff/minify/json) >= 2 with golang(github BuildRequires: (golang(github.com/tdewolff/minify/svg) >= 2 with golang(github.com/tdewolff/minify/svg) < 3) BuildRequires: (golang(github.com/tdewolff/minify/xml) >= 2 with golang(github.com/tdewolff/minify/xml) < 3) BuildRequires: golang(github.com/yosssi/ace) +BuildRequires: golang(gocloud.dev/blob) +BuildRequires: golang(gocloud.dev/blob/azureblob) +BuildRequires: golang(gocloud.dev/blob/fileblob) +BuildRequires: golang(gocloud.dev/blob/gcsblob) +BuildRequires: golang(gocloud.dev/blob/s3blob) +BuildRequires: golang(golang.org/x/image/bmp) +BuildRequires: golang(golang.org/x/image/tiff) BuildRequires: golang(golang.org/x/image/webp) BuildRequires: golang(golang.org/x/sync/errgroup) +BuildRequires: golang(golang.org/x/sync/semaphore) BuildRequires: golang(golang.org/x/text/runes) BuildRequires: golang(golang.org/x/text/transform) BuildRequires: golang(golang.org/x/text/unicode/norm) @@ -84,11 +109,13 @@ BuildRequires: golang(gopkg.in/yaml.v2) %if %{with check} # Tests -BuildRequires: golang(github.com/alecthomas/assert) BuildRequires: golang(github.com/fortytw2/leaktest) +%if %{without bootstrap} +BuildRequires: golang(github.com/gohugoio/testmodBuilder/mods) +%endif +BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) BuildRequires: golang(github.com/sanity-io/litter) -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/require) +BuildRequires: golang(gocloud.dev/blob/memblob) BuildRequires: python3-docutils BuildRequires: python3-pygments BuildRequires: rubygem-asciidoctor @@ -103,9 +130,10 @@ BuildRequires: rubygem-asciidoctor %prep %goprep -%if %{?fedora} > 29 +%patch0001 -p1 %patch0002 -p1 -%endif +%patch0003 -p1 +%patch0004 -p1 # Replace blackfriday import path to avoid conflict with v2 # Depend on unversioned tdewolff/minify until Go modules are supported in Fedora @@ -117,6 +145,12 @@ sed -i \ # Skip test that assumes directory is in a git repository sed -i '/TestPageWithLastmodFromGitInfo/a t.Skip()' hugolib/page_test.go +%if %{with bootstrap} +# Delete test using github.com/gohugoio/testmodBuilder/mods which has a +# dependency loop. +rm hugolib/hugo_modules_test.go +%endif + %build %gobuild -o %{gobuilddir}/bin/hugo %{goipath} @@ -153,6 +187,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1 %changelog +* Wed Oct 16 2019 Elliott Sales de Andrade - 0.58.3-1 +- Update to latest version + * Thu Aug 01 2019 Elliott Sales de Andrade - 0.55.6-3 - Update to latest Go macros