public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hugo] f43: Update spec
@ 2026-06-07 20:57 Mikel Olasagasti Uranga
0 siblings, 0 replies; only message in thread
From: Mikel Olasagasti Uranga @ 2026-06-07 20:57 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/hugo
Branch : f43
Commit : befbd0335e4dd06162ad5e1199459835bd87fc59
Author : Mikel Olasagasti Uranga <mikel@olasagasti.info>
Date : 2026-06-07T15:37:33-05:00
Stats : +27/-150 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/hugo/c/befbd0335e4dd06162ad5e1199459835bd87fc59?branch=f43
Log:
Update spec
- Update to go2rpm 1.19.0 template
- Set `askalono` as license detector
- Drop invopop/yaml to oasdiff/yaml module change
- Use GO_BUILDTAGS & GO_LDFLAGS
- Use gocheck2 and skip individual tests
- Drop extra documentation
---
diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
index 2126a17..fddc607 100644
--- a/go-vendor-tools.toml
+++ b/go-vendor-tools.toml
@@ -1,5 +1,7 @@
[archive]
+[licensing]
+detector = "askalono"
[[licensing.licenses]]
path = "docs/LICENSE.md"
sha256sum = "60619c2bcd9ee1b479943ae5504fed8f55ee63a1abb7c0dc76f96cca4fc019b7"
@@ -16,11 +18,6 @@ sha256sum = "e7bf754e7153012a3a8ff697d21acd6c12e590d6a55f2aef8ee83616aa9a795f"
expression = "MIT"
[[licensing.licenses]]
-path = "vendor/github.com/bep/golibsass/libsass_src/COPYING"
-sha256sum = "619c195be45054a9b8d6e4c114381fe0a015fddc9663ca7940660312b74d7592"
-expression = "MIT"
-
-[[licensing.licenses]]
path = "vendor/github.com/oasdiff/yaml/LICENSE"
sha256sum = "24653fd8a39354396da1a265d68316399edc39b1df48c5866d55f9f06484fa9a"
expression = "BSD-3-Clause AND MIT"
diff --git a/hugo.spec b/hugo.spec
index 935e30b..25f75e8 100644
--- a/hugo.spec
+++ b/hugo.spec
@@ -1,6 +1,5 @@
-# Generated by go2rpm 1.16.0
+# Generated by go2rpm 1.19.0
%bcond check 1
-%global debug_package %{nil}
# To update:
# 1. Update the version in this file.
@@ -26,18 +25,16 @@ Version: 0.159.0
%gometa -L -f
-%global common_description %{expand:
-The world’s fastest framework for building websites.}
Name: hugo
Release: %autorelease
Summary: The world’s fastest framework for building websites
-# Generated by go-vendor-tools:
+# Generated by go-vendor-tools
License: 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unlicense
URL: %{gourl}
Source0: %{gosource}
-# Generated by go-vendor-tools:
+# Generated by go-vendor-tools
Source1: %{archivename}-vendor.tar.bz2
Source2: go-vendor-tools.toml
# Needed for vendor/golibsass; go-vendor-tools does not grab C code from Go repositories:
@@ -51,15 +48,12 @@ Patch0002: 0020-fix-errorf.patch
BuildRequires: go-vendor-tools
BuildRequires: gcc-c++
-%description %{common_description}
+%description
+The world’s fastest framework for building websites.
%prep
-%goprep -A
-%setup -q -T -D -a1 %{forgesetupargs}
-%autopatch -p1
-
-# Fix goipath:
-sed -i 's|invopop/yaml|oasdiff/yaml|g' $(find . -iname '*.go' -type f)
+%goprep -p1
+tar -xf %{S:1}
# Needed for vendor/golibsass; go-vendor-tools does not grab C code from Go repositories:
mkdir vendor/github.com/bep/golibsass/libsass_src
@@ -75,13 +69,13 @@ tar xvf %SOURCE3 -C vendor/github.com/bep/golibsass/libsass_src --strip-componen
# https://bugzilla.redhat.com/show_bug.cgi?id=2428281
%global __golang_extldflags -Wl,-z,undefs -Wl,-z,notext
+%global gomodulesmode GO111MODULE=on
# Build extended version of Hugo.
-BUILDTAGS="extended" LDFLAGS="${LDFLAGS} -X %{goipath}/common/hugo.buildDate=$(date --iso=seconds --date=@$SOURCE_DATE_EPOCH) -X %{goipath}/common/hugo.vendorInfo=Fedora:%{version}-%{release}" %gobuild -o %{gobuilddir}/bin/hugo %{goipath}
+export GO_BUILDTAGS="extended"
+export GO_LDFLAGS="${LDFLAGS} -X %{goipath}/common/hugo.buildDate=$(date --iso=seconds --date=@$SOURCE_DATE_EPOCH) \
+ -X %{goipath}/common/hugo.vendorInfo=Fedora:%{version}-%{release}"
+%gobuild -o %{gobuilddir}/bin/hugo %{goipath}
-# Generated by go2rpm, but deactivated here.
-# for cmd in livereload/gen markup/goldmark scripts/fork_go_templates; do
-# %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
-# done
%install
%go_vendor_license_install -c %{S:2}
@@ -91,136 +85,22 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%check
%go_vendor_license_check -c %{S:2}
%if %{with check}
-
-# .: extensive test that uses network.
-# common/text: terminal coloring?
-# The rest are: relocation target github.com/tetratelabs/wazero/internal/engine/wazevo/backend/isa/amd64.entrypoint not defined
-%gocheck \
- -d . \
- -d common/text \
- -d cache/filecache \
- -d cache/httpcache \
- -d common/herrors \
- -d common/htime \
- -d common/hugo \
- -d common/paths \
- -d config/allconfig \
- -d config/testconfig \
- -d create \
- -d hugofs \
- -d hugofs/glob \
- -d hugolib \
- -d hugolib/filesystems \
- -d hugolib/pagesfromdata \
- -d hugolib/roles \
- -d hugolib/segments \
- -d hugolib/sitesmatrix \
- -d hugolib/versions \
- -d internal/js/esbuild \
- -d internal/warpc \
- -d langs \
- -d langs/i18n \
- -d markup/asciidocext \
- -d markup/goldmark \
- -d markup/goldmark/blockquotes \
- -d markup/goldmark/codeblocks \
- -d markup/goldmark/images \
- -d markup/goldmark/internal/extensions/attributes \
- -d markup/goldmark/passthrough \
- -d markup/goldmark/tables \
- -d markup/highlight \
- -d markup/tableofcontents \
- -d minifiers \
- -d modules \
- -d modules/npm \
- -d output \
- -d parser/metadecoders \
- -d related \
- -d resources \
- -d resources/images \
- -d resources/images/meta \
- -d resources/page \
- -d resources/page/pagemeta \
- -d resources/resource \
- -d resources/resource_factories/create \
- -d resources/resource_transformers/babel \
- -d resources/resource_transformers/cssjs \
- -d resources/resource_transformers/integrity \
- -d resources/resource_transformers/js \
- -d resources/resource_transformers/minifier \
- -d resources/resource_transformers/templates \
- -d resources/resource_transformers/tocss/dartsass \
- -d resources/resource_transformers/tocss/scss \
- -d tpl/cast \
- -d tpl/collections \
- -d tpl/css \
- -d tpl/data \
- -d tpl/debug \
- -d tpl/fmt \
- -d tpl/images \
- -d tpl/lang \
- -d tpl/math \
- -d tpl/openapi/openapi3 \
- -d tpl/os \
- -d tpl/page \
- -d tpl/partials \
- -d tpl/path \
- -d tpl/reflect \
- -d tpl/resources \
- -d tpl/strings \
- -d tpl/templates \
- -d tpl/time \
- -d tpl/tplimpl \
- -d tpl/transform \
- -d tpl/urls \
-
+%global ignores %{shrink:
+ -s TestCommands
+ -s TestModulePrivateRepo
+ -s TestGitInfoFromGitModuleWithGoMod
+ -s TestGitInfoFromGitModuleWithVersionQuery
+ -s TestModuleImportWithVersion
+ -s TestGetRemoteHead
+ -s TestGetRemoteResponseHeaders
+ -s TestVimeoShortcode
+ -s TestPagesFromGoTmplAsciiDocAndSimilar
+}
+%gocheck2 -F %{ignores}
%endif
%files -f %{go_vendor_license_filelist}
-%license vendor/modules.txt
-%doc docs CONTRIBUTING.md README.md SECURITY.md
-%doc create/skeletons/theme/content/_index.md
-%doc create/skeletons/theme/content/posts/_index.md
-%doc create/skeletons/theme/content/posts/post-1.md
-%doc create/skeletons/theme/content/posts/post-2.md
-%doc create/skeletons/theme/content/posts/post-3/index.md
-%doc hugolib/testsite/content/first-post.md
-%doc hugolib/testsite/content_nn/first-post.md
-%doc testscripts/commands/commands_errors.txt
-%doc testscripts/commands/completion.txt testscripts/commands/config.txt
-%doc testscripts/commands/config__cachedir.txt testscripts/commands/convert.txt
-%doc testscripts/commands/deprecate.txt testscripts/commands/env.txt
-%doc testscripts/commands/gen.txt testscripts/commands/hugo.txt
-%doc testscripts/commands/hugo__configdir.txt
-%doc testscripts/commands/hugo__errors.txt testscripts/commands/hugo__flags.txt
-%doc testscripts/commands/hugo__noconfig.txt
-%doc testscripts/commands/hugo__path-warnings-postprocess.txt
-%doc testscripts/commands/hugo__path-warnings.txt
-%doc testscripts/commands/hugo__path-warnings_issue13164.txt
-%doc testscripts/commands/hugo__processingstats.txt
-%doc testscripts/commands/hugo__processingstats2.txt
-%doc testscripts/commands/hugo__publishdir_in_config.txt
-%doc testscripts/commands/hugo__static_composite.txt
-%doc testscripts/commands/hugo_build.txt
-%doc testscripts/commands/hugo_configdev_env.txt
-%doc testscripts/commands/hugo_configdev_environment.txt
-%doc testscripts/commands/hugo_configprod.txt
-%doc testscripts/commands/hugo_printpathwarnings.txt
-%doc testscripts/commands/hugo_printunusedtemplates.txt
-%doc testscripts/commands/import_jekyll.txt testscripts/commands/list.txt
-%doc testscripts/commands/mod.txt testscripts/commands/mod__disable.txt
-%doc testscripts/commands/mod__themesdir.txt testscripts/commands/mod_get.txt
-%doc testscripts/commands/mod_get_u.txt testscripts/commands/mod_init.txt
-%doc testscripts/commands/mod_npm.txt
-%doc testscripts/commands/mod_npm_withexisting.txt
-%doc testscripts/commands/mod_tidy.txt testscripts/commands/mod_vendor.txt
-%doc testscripts/commands/new.txt testscripts/commands/new_content.txt
-%doc testscripts/commands/new_content_archetypedir.txt
-%doc testscripts/commands/noop.txt
-%doc testscripts/commands/version.txt testscripts/commands/warnf_stderr.txt
-%doc testscripts/unfinished/noop.txt testscripts/withdeploy/deploy.txt
-%doc testscripts/withdeploy-off/deploy_off.txt
-%doc tpl/tplimpl/embedded/templates/robots.txt
+%doc docs AGENTS.md CLAUDE.md CONTRIBUTING.md README.md SECURITY.md
%{_bindir}/hugo
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-07 20:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-07 20:57 [rpms/hugo] f43: Update spec Mikel Olasagasti Uranga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox