Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2019-04-10 04:28:06 -04:00
parent ae5310d626
commit 2989e044c3
6 changed files with 10 additions and 99 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/hugo-0.37.1.tar.gz
/hugo-0.38.tar.gz
/hugo-0.54.0.tar.gz
/hugo-0.55.0.tar.gz

View File

@ -1,4 +1,4 @@
From a66029c8d92210dec8272f9d89964b9f5c322f9a Mon Sep 17 00:00:00 2001
From b1373ca1d5813cdefe505cc8d535674e6e6647d6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
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 <quantum.analyst@gmail.com>
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/data/docs.json b/docs/data/docs.json
index 5b1388fe..c7687e45 100644
index 4a68378a..ce732d1b 100644
--- a/docs/data/docs.json
+++ b/docs/data/docs.json
@@ -3866,7 +3866,7 @@
@@ -4060,7 +4060,7 @@
"Examples": [
[
"{{ \"I :heart: Hugo\" | emojify }}",

View File

@ -1,61 +0,0 @@
From a9ccc9df05b2d5b0f6e1f0b45adeacc27eeb4930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
<bjorn.erik.pedersen@gmail.com>
Date: Sat, 2 Feb 2019 12:04:42 +0100
Subject: [PATCH] commands: Update debouncer version
---
commands/commandeer.go | 2 +-
go.mod | 2 +-
go.sum | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/commands/commandeer.go b/commands/commandeer.go
index 75d69b251..3939d3bd0 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -143,7 +143,7 @@ func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f fla
// The time value used is tested with mass content replacements in a fairly big Hugo site.
// It is better to wait for some seconds in those cases rather than get flooded
// with rebuilds.
- rebuildDebouncer, _, _ = debounce.New(4 * time.Second)
+ rebuildDebouncer = debounce.New(4 * time.Second)
}
c := &commandeer{
diff --git a/go.mod b/go.mod
index d60deb020..ce5a4e04a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38
github.com/alecthomas/chroma v0.6.2
github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
- github.com/bep/debounce v1.1.0
+ github.com/bep/debounce v1.2.0
github.com/bep/gitmap v1.0.0
github.com/bep/go-tocss v0.6.0
github.com/chaseadamsio/goorgeous v1.1.0
diff --git a/go.sum b/go.sum
index a692cf7f5..e2cf53c75 100644
--- a/go.sum
+++ b/go.sum
@@ -18,8 +18,8 @@ github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1p
github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E=
github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/bep/debounce v1.1.0 h1:6ocXeW2iZ/7vAzgXz82J00tYxncMiEEBExPftTtOQzk=
-github.com/bep/debounce v1.1.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
+github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
+github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
github.com/bep/gitmap v1.0.0 h1:cTTZwq7vpGuhwefKCBDV9UrHnZAPVJTvoWobimrqkUc=
github.com/bep/gitmap v1.0.0/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY=
github.com/bep/go-tocss v0.6.0 h1:lJf+nIjsQDpifUr+NgHi9QMBnrr9cFvMvEBT+uV9Q9E=
@@ -75,7 +75,6 @@ github.com/magefile/mage v1.4.0 h1:RI7B1CgnPAuu2O9lWszwya61RLmfL0KCdo+QyyI/Bhk=
github.com/magefile/mage v1.4.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA=
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 h1:LZhVjIISSbj8qLf2qDPP0D8z0uvOWAW5C85ly5mJW6c=
github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=

View File

@ -1,27 +0,0 @@
commit b4148cd1d9ea889b81070d3e84a37bd5d23e5746
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue Feb 19 21:47:03 2019 +0100
hugolib: Adjust test for Go 1.12
diff --git a/hugolib/hugo_sites_build_errors_test.go b/hugolib/hugo_sites_build_errors_test.go
index fce6ec91..dd80946e 100644
--- a/hugolib/hugo_sites_build_errors_test.go
+++ b/hugolib/hugo_sites_build_errors_test.go
@@ -3,6 +3,7 @@ package hugolib
import (
"fmt"
"path/filepath"
+ "regexp"
"runtime"
"strings"
"testing"
@@ -211,7 +212,7 @@ func TestSiteBuildErrors(t *testing.T) {
assertBuildError: func(a testSiteBuildErrorAsserter, err error) {
assert.Error(err)
// This is fixed in latest Go source
- if strings.Contains(runtime.Version(), "devel") {
+ if regexp.MustCompile("devel|12").MatchString(runtime.Version()) {
fe := a.getFileError(err)
assert.Equal(5, fe.Position().LineNumber)
assert.Equal(21, fe.Position().ColumnNumber)

View File

@ -1,23 +1,19 @@
# https://github.com/gohugoio/hugo
%global goipath github.com/gohugoio/hugo
Version: 0.54.0
Version: 0.55.0
%gometa
Name: hugo
Release: 2%{?dist}
Release: 1%{?dist}
Summary: A Fast and Flexible Static Site Generator built with love in GoLang
License: ASL 2.0 and MIT
URL: %{gourl}
Source0: %{gosource}
# Fix build with golang-github-bep-debounce 1.2.0
Patch0001: https://github.com/gohugoio/hugo/pull/5670.patch
%if %{?fedora} > 29
# Fix build against golang-github-kyokomi-emoji 2.1
Patch0002: 0001-Fix-tests-against-latest-emoji-package.patch
%endif
# Adjust test for Go 1.12
Patch0003: b4148cd1d9ea889b81070d3e84a37bd5d23e5746.patch
%description
Hugo is a static HTML and CSS website generator written in Go. It is optimized
@ -68,7 +64,6 @@ BuildRequires: golang(github.com/spf13/cobra)
BuildRequires: golang(github.com/spf13/cobra/doc)
BuildRequires: golang(github.com/spf13/fsync)
BuildRequires: golang(github.com/spf13/jwalterweatherman)
BuildRequires: golang(github.com/spf13/nitro)
BuildRequires: golang(github.com/spf13/pflag)
BuildRequires: golang(github.com/spf13/viper)
BuildRequires: (golang(github.com/tdewolff/minify) >= 2 with golang(github.com/tdewolff/minify) < 3)
@ -153,6 +148,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1
%changelog
* Wed Apr 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.55.0-1
- Update to latest version
* Fri Mar 22 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.54.0-2
- Add bash-completion
- Add man pages

View File

@ -1 +1 @@
SHA512 (hugo-0.54.0.tar.gz) = 904b9ae9e3db91195e9e768faca8867d6534d20f64b19dec4d1788ca5f19863e9fac284821855ffef9bee6280d77cc72816c42b6e28b5f3a4f45d12daf6b9d0d
SHA512 (hugo-0.55.0.tar.gz) = 280b49e72527e916c07f445259491fd673e6951688e86f297ff814183072e3d68b49718f9b7e9849f492a0f0a14f9e2afe49e453ada9ec7b5e8d3813d9349fb1