Update to 0.75.1

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
2020-09-18 06:30:52 +02:00 · 2020-09-18 06:30:52 +02:00 · abc68b1525
parent 0d9a6574af
commit abc68b1525
7 changed files with 80 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,4 @@
 /hugo-0.70.0.tar.gz
 /hugo-0.72.0.tar.gz
 /hugo-0.73.0.tar.gz
+/hugo-0.75.1.tar.gz
--- a/0001-Remove-trailing-semicolon.patch
+++ b/0001-Remove-trailing-semicolon.patch
@ -0,0 +1,24 @@
+diff -up hugo-0.75.1/hugolib/resource_chain_test.go.orig hugo-0.75.1/hugolib/resource_chain_test.go
+--- hugo-0.75.1/hugolib/resource_chain_test.go.orig	2020-09-15 08:45:52.000000000 +0200
+++ hugo-0.75.1/hugolib/resource_chain_test.go	2020-09-18 06:09:09.236592187 +0200
+@@ -489,7 +489,7 @@ Min HTML: {{ ( resources.Get "mydata/htm
+ `)
+ 		}, func(b *sitesBuilder) {
+ 			b.AssertFileContent("public/index.html", `Min CSS: h1{font-style:bold}`)
+-			b.AssertFileContent("public/index.html", `Min JS: var x;x=5;document.getElementById(&#34;demo&#34;).innerHTML=x*10;`)
+			b.AssertFileContent("public/index.html", `Min JS: var x;x=5,document.getElementById(&#34;demo&#34;).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: <hello><world>Hugo Rocks!</<world></hello>`)
+ 			b.AssertFileContent("public/index.html", `Min SVG: <svg height="100" width="100"><path d="M1e2 1e2H3e2 2e2z"/></svg>`)
+diff -up hugo-0.75.1/minifiers/minifiers_test.go.orig hugo-0.75.1/minifiers/minifiers_test.go
+--- hugo-0.75.1/minifiers/minifiers_test.go.orig	2020-09-15 08:45:52.000000000 +0200
+++ hugo-0.75.1/minifiers/minifiers_test.go	2020-09-18 06:09:25.456620712 +0200
+@@ -34,7 +34,7 @@ func TestNew(t *testing.T) {
+ 	var rawJS string
+ 	var minJS string
+ 	rawJS = " var  foo =1 ;   foo ++  ;  "
+-	minJS = "var foo=1;foo++;"
+	minJS = "var foo=1;foo++"
+ 
+ 	var rawJSON string
+ 	var minJSON string
--- a/0001-Update-to-minify-2.9.4.patch
+++ b/0001-Update-to-minify-2.9.4.patch
@ -0,0 +1,25 @@
+diff -up hugo-0.75.1/minifiers/config.go.orig hugo-0.75.1/minifiers/config.go
+--- hugo-0.75.1/minifiers/config.go.orig	2020-09-15 08:45:52.000000000 +0200
+++ hugo-0.75.1/minifiers/config.go	2020-09-18 05:16:56.831084978 +0200
+@@ -35,18 +35,16 @@ var defaultTdewolffConfig = tdewolffConf
+ 		KeepEndTags:             true,
+ 		KeepDefaultAttrVals:     true,
+ 		KeepWhitespace:          false,
+-		// KeepQuotes:              false, >= v2.6.2
+		KeepQuotes:              false,
+ 	},
+ 	CSS: css.Minifier{
+-		Decimals: -1, // will be deprecated
+-		// Precision: 0,  // use Precision with >= v2.7.0
+		Precision: 0,  // use Precision with >= v2.7.0
+ 		KeepCSS2: true,
+ 	},
+ 	JS:   js.Minifier{},
+ 	JSON: json.Minifier{},
+ 	SVG: svg.Minifier{
+-		Decimals: -1, // will be deprecated
+-		// Precision: 0,  // use Precision with >= v2.7.0
+		Precision: 0,  // use Precision with >= v2.7.0
+ 	},
+ 	XML: xml.Minifier{
+ 		KeepWhitespace: false,
--- a/0005-skip-modules-TestClient.patch
+++ b/0005-skip-modules-TestClient.patch
@ -8,11 +8,12 @@ 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 @@
+@@ -27,7 +27,7 @@ import (
 )
 
 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.
+-
+	t.Skip("skip test as network access is not allowed during package build")
+ 	modName := "hugo-modules-basic-test"
+ 	modPath := "github.com/gohugoio/tests/" + modName
+ 	expect := `github.com/gohugoio/tests/hugo-modules-basic-test github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0
--- a/0006-skip-TestHugoModulesTargetInSubFolder.patch
+++ b/0006-skip-TestHugoModulesTargetInSubFolder.patch
@ -9,12 +9,11 @@ Last-Update: 2020-02-27
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/hugolib/hugo_modules_test.go
 +++ b/hugolib/hugo_modules_test.go
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@ import (
+ )
 
- // https://github.com/gohugoio/hugo/issues/6730
- func TestHugoModulesTargetInSubFolder(t *testing.T) {
-+	t.Skip("Skip test as network is inaccessible during Debian package build")
-	if !isCI() {
-		// TODO(bep) investigate why this fails when running in LiteIDE (it works from the shell).
-		t.Skip("skip (relative) long running modules test when running locally")
-	}
+ func TestHugoModulesVariants(t *testing.T) {
+	t.Skip("Skip test as network is inaccessible during package build")
+ 	if !isCI() {
+ 		t.Skip("skip (relative) long running modules test when running locally")
+ 	}
--- a/hugo.spec
+++ b/hugo.spec
@ -4,7 +4,7 @@

 # https://github.com/gohugoio/hugo
 %global goipath github.com/gohugoio/hugo
-Version:        0.73.0
+Version:        0.75.1

 %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:        3%{?dist}
+Release:        1%{?dist}
 Summary:        The world’s fastest framework for building websites

 # Upstream license specification: Apache-2.0 and MIT
@ -25,12 +25,18 @@ License:        ASL 2.0 and MIT
 URL:            %{gourl}
 Source0:        %{gosource}
 # Skip tests that uses the network.
-Patch0001:      https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch
-Patch0002:      https://sources.debian.org/data/main/h/hugo/0.69.0-1/debian/patches/0006-skip-TestHugoModulesTargetInSubFolder.patch
+# https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch
+Patch0001:      0005-skip-modules-TestClient.patch
+# https://sources.debian.org/data/main/h/hugo/0.69.0-1/debian/patches/0006-skip-TestHugoModulesTargetInSubFolder.patch
+Patch0002:      0006-skip-TestHugoModulesTargetInSubFolder.patch
 # Fix error message that changed in gocloud.
 Patch0003:      0001-Update-error-message.patch
+# Minify 2.9.3 removed Decimals in favor of Precision
+Patch0004:      0001-Update-to-minify-2.9.4.patch
+# Fix for TestResourceChains/minify failure
+Patch0005:      0001-Remove-trailing-semicolon.patch

-BuildRequires:  golang(github.com/bep/golibsass/libsass) >= 0.5.0
+BuildRequires:  golang(github.com/bep/golibsass/libsass) >= 0.7.0

 %description
 %{common_description}
@ -43,12 +49,12 @@ BuildRequires:  golang(github.com/bep/golibsass/libsass) >= 0.5.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1

 # Replace blackfriday import path to avoid conflict with v2
-# Depend on unversioned tdewolff/minify until Go modules are supported in Fedora
 sed -i \
    -e 's|"github.com/russross/blackfriday|"gopkg.in/russross/blackfriday.v1|' \
-    -e 's|"github.com/tdewolff/minify/v2|"github.com/tdewolff/minify|' \
    $(find . -name '*.go')

 # Skip test that assumes directory is in a git repository
@ -98,6 +104,9 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1


 %changelog
+* Fri Sep 18 04:37:22 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.75.1-1
+- Update to 0.75.1
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.73.0-3
 - Second attempt - Rebuilt for
  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (hugo-0.73.0.tar.gz) = 16c989382437cb18ee837873e5872b047b12fd09c1f432131a0889a6fd5614a2fea9d510c13b5862fc2c0a760aef18f26ee3d398d66b6ae5f15e375ef86ac4c9
+SHA512 (hugo-0.75.1.tar.gz) = d942457a00c9cd58a6a2c2081da889e5d6cdf7839d8ed0b74f7a2888babcdbf5fcf2ba297085cf9ddda60f388e0b41e8b2527471d3a515119b7073e8ee9c2831