From 2edbc87783da32e98e40ea102787afd9adc92e2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:27:33 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5d638c23393dbde3e1eafcd08be672bee2986e06 Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 18 Apr 2025 02:31:29 -0500 Subject: [PATCH 2/9] Update to version 2.1.0 rhbz#2348672 --- .gitignore | 2 +- ...networked-tests-if-no-connection-661.patch | 59 ----- create-vendor-tarball.sh | 10 +- glow.spec | 219 +++++++++--------- sources | 3 +- 5 files changed, 120 insertions(+), 173 deletions(-) delete mode 100644 0001-test-skip-networked-tests-if-no-connection-661.patch diff --git a/.gitignore b/.gitignore index efe8f6e..13b11da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/glow-*-vendored.tar.gz +/glow-*.tar.gz diff --git a/0001-test-skip-networked-tests-if-no-connection-661.patch b/0001-test-skip-networked-tests-if-no-connection-661.patch deleted file mode 100644 index f4f0a8e..0000000 --- a/0001-test-skip-networked-tests-if-no-connection-661.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0f0295723213d1da702602450ef75dc8a26dab60 Mon Sep 17 00:00:00 2001 -From: bashbunni <15822994+bashbunni@users.noreply.github.com> -Date: Wed, 18 Dec 2024 11:10:03 -0800 -Subject: [PATCH] test: skip networked tests if no connection (#661) - -* test: skip networked tests if no connection - -* fix: handle unexpected http responses - -* fix: return if a valid URL is generated - -* test: delete networked test - -(cherry picked from commit 7b3bfac3068c5501adc83c2c1a3914c84b0cb136) ---- - glow_test.go | 24 ------------------------ - 1 file changed, 24 deletions(-) - -diff --git a/glow_test.go b/glow_test.go -index 1a8ad18..8743be2 100644 ---- a/glow_test.go -+++ b/glow_test.go -@@ -1,33 +1,9 @@ - package main - - import ( -- "bytes" - "testing" - ) - --func TestGlowSources(t *testing.T) { -- tt := []string{ -- ".", -- "README.md", -- "github.com/charmbracelet/glow", -- "github://charmbracelet/glow", -- "https://github.com/charmbracelet/glow", -- } -- -- for _, v := range tt { -- t.Run(v, func(t *testing.T) { -- buf := &bytes.Buffer{} -- err := executeArg(rootCmd, v, buf) -- if err != nil { -- t.Errorf("Error during execution (args: %s): %v", v, err) -- } -- if buf.Len() == 0 { -- t.Errorf("Output buffer should not be empty (args: %s)", v) -- } -- }) -- } --} -- - func TestGlowFlags(t *testing.T) { - tt := []struct { - args []string --- -2.47.1 - diff --git a/create-vendor-tarball.sh b/create-vendor-tarball.sh index 593d7ce..ac0ea2f 100755 --- a/create-vendor-tarball.sh +++ b/create-vendor-tarball.sh @@ -9,6 +9,9 @@ fi set -euo pipefail +REPO="https://github.com/charmbracelet/glow" +PKG="glow" + # transform tag into version # v2.0.0 -> 2.0.0 version=${tag#v} @@ -16,9 +19,8 @@ version=${tag#v} echo "Using tag: $tag" echo "Using version: $version" -git -c advice.detachedHead=false clone --branch $tag --depth 1 https://github.com/charmbracelet/glow.git glow-$version -pushd glow-$version +git -c advice.detachedHead=false clone --branch $tag --depth 1 $REPO.git $PKG-$version +pushd $PKG-$version GOPROXY='https://proxy.golang.org,direct' go mod vendor popd -tar --exclude .git -czf glow-$version-vendored.tar.gz glow-$version -#rm -r glow-$version +tar -C $PKG-$version -czf $PKG-$version-vendor.tar.gz vendor diff --git a/glow.spec b/glow.spec index 78c271d..51d2fac 100644 --- a/glow.spec +++ b/glow.spec @@ -1,153 +1,157 @@ -%global goipath github.com/charmbracelet/glow +%define goipath github.com/charmbracelet/glow Name: glow -Version: 2.0.0 +Version: 2.1.0 Release: %autorelease Summary: Terminal based markdown reader -# main source code is MIT -# see comments above provides tags for bundled license breakdown -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND OFL-1.1 URL: https://github.com/charmbracelet/glow +# main source code is MIT +# Apache-2.0: +# github.com/inconshreveable/mousetrap +# github.com/spf13/afero +# github.com/spf13/cobra +# gopkg.in/ini.v1 +# BSD-2-Clause: +# github.com/magiconair/properties +# BSD-3-Clause: +# github.com/atotto/clipboard +# github.com/fsnotify/fsnotify +# github.com/gorilla/css +# github.com/microcosm-cc/bluemonday +# github.com/sagikazarmark/slog-shim +# github.com/spf13/pflag +# golang.org/x/exp +# golang.org/x/net +# golang.org/x/sync +# golang.org/x/sys +# golang.org/x/term +# golang.org/x/text +# MIT: +# github.com/aymanbagabas/go-osc52/v2 +# github.com/aymerick/douceur +# github.com/caarlos0/env/v11 +# github.com/charmbracelet/bubbles +# github.com/charmbracelet/bubbletea +# github.com/charmbracelet/glamour +# github.com/charmbracelet/lipgloss +# github.com/charmbracelet/log +# github.com/charmbracelet/x/ansi +# github.com/charmbracelet/x/editor +# github.com/charmbracelet/x/term +# github.com/dlclark/regexp2 +# github.com/dustin/go-humanize +# github.com/erikgeiser/coninput +# github.com/go-logfmt/logfmt +# github.com/lucasb-eyer/go-colorful +# github.com/mattn/go-isatty +# github.com/mattn/go-localereader +# github.com/mattn/go-runewidth +# github.com/mitchellh/go-homedir +# github.com/mitchellh/mapstructure +# github.com/muesli/ansi +# github.com/muesli/cancelreader +# github.com/muesli/gitcha +# github.com/muesli/go-app-paths +# github.com/muesli/mango +# github.com/muesli/mango-cobra +# github.com/muesli/mango-pflag +# github.com/muesli/reflow +# github.com/muesli/roff +# github.com/muesli/termenv +# github.com/pelletier/go-toml/v2 +# github.com/rivo/uniseg +# github.com/sabhiram/go-gitignore +# github.com/sagikazarmark/locafero +# github.com/sahilm/fuzzy +# github.com/sourcegraph/conc +# github.com/spf13/cast +# github.com/spf13/viper +# github.com/subosito/gotenv +# github.com/yuin/goldmark +# github.com/yuin/goldmark-emoji +# go.uber.org/atomic +# go.uber.org/multierr +# MPL-2.0: +# github.com/hashicorp/hcl +# Apache-2.0 AND MIT +# gopkg.in/yaml.v3 +# MIT AND OFL-1.1: +# github.com/alecthomas/chroma/v2 +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND OFL-1.1 + +Source0: %{url}/archive/v%{version}/glow-%{version}.tar.gz +Source1: glow-%{version}-vendor.tar.gz +Source2: create-vendor-tarball.sh + BuildRequires: go-rpm-macros ExclusiveArch: %{golang_arches_future} +# https://github.com/charmbracelet/glow/commit/546b6287d80af885cc3069de895083af36aa91e3 +BuildRequires: golang >= 1.23.6 -# see create-vendor-tarball.sh for how to create this -Source0: glow-%{version}-vendored.tar.gz - -# Script that creates vendor tarball -Source100: create-vendor-tarball.sh - -# https://github.com/charmbracelet/glow/pull/661 -Patch: 0001-test-skip-networked-tests-if-no-connection-661.patch - -BuildRequires: golang - -# MIT AND OFL-1.1 Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.14.0 -# BSD-3-Clause Provides: bundled(golang(github.com/atotto/clipboard)) = 0.1.4 -# MIT Provides: bundled(golang(github.com/aymanbagabas/go-osc52/v2)) = 2.0.1 -# MIT Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0 -# MIT -Provides: bundled(golang(github.com/caarlos0/env/v11)) = 11.0.1 -# MIT -Provides: bundled(golang(github.com/charmbracelet/bubbles)) = 0.18.0 -# MIT -Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = ea13ffb -# MIT +Provides: bundled(golang(github.com/caarlos0/env/v11)) = 11.3.1 +Provides: bundled(golang(github.com/charmbracelet/bubbles)) = 0.20.0 +Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = 1.3.3 Provides: bundled(golang(github.com/charmbracelet/glamour)) = 0.8.0 -# MIT -Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 87dd58d -# MIT +Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 1.0.0 Provides: bundled(golang(github.com/charmbracelet/log)) = 0.4.0 -# MIT -Provides: bundled(golang(github.com/charmbracelet/x/ansi)) = 0.1.4 -# MIT -Provides: bundled(golang(github.com/charmbracelet/x/editor)) = 2627ec1 -# MIT -Provides: bundled(golang(github.com/charmbracelet/x/input)) = 0.1.2 -# MIT -Provides: bundled(golang(github.com/charmbracelet/x/term)) = 0.1.1 -# MIT -Provides: bundled(golang(github.com/charmbracelet/x/windows)) = 0.1.2 -# MIT +Provides: bundled(golang(github.com/charmbracelet/x/ansi)) = 0.8.0 +Provides: bundled(golang(github.com/charmbracelet/x/editor)) = 0.1.0 +Provides: bundled(golang(github.com/charmbracelet/x/term)) = 0.2.1 Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.0 -# MIT Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 -# MIT Provides: bundled(golang(github.com/erikgeiser/coninput)) = 1c3628e -# BSD-3-Clause -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.6.0 -# MIT +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.8.0 Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 -# BSD-3-Clause Provides: bundled(golang(github.com/gorilla/css)) = 1.0.1 -# MPL-2.0 Provides: bundled(golang(github.com/hashicorp/hcl)) = 1.0.0 -# Apache-2.0 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 -# MIT Provides: bundled(golang(github.com/lucasb-eyer/go-colorful)) = 1.2.0 -# BSD-2-Clause Provides: bundled(golang(github.com/magiconair/properties)) = 1.8.7 -# MIT Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 -# MIT Provides: bundled(golang(github.com/mattn/go-localereader)) = 0.0.1 -# MIT -Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.15 -# BSD-3-Clause +Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.16 Provides: bundled(golang(github.com/microcosm-cc/bluemonday)) = 1.0.27 -# MIT Provides: bundled(golang(github.com/mitchellh/go-homedir)) = 1.1.0 -# MIT Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.5.0 -# MIT Provides: bundled(golang(github.com/muesli/ansi)) = 276c624 -# MIT Provides: bundled(golang(github.com/muesli/cancelreader)) = 0.2.2 -# MIT Provides: bundled(golang(github.com/muesli/gitcha)) = 0.3.0 -# MIT Provides: bundled(golang(github.com/muesli/go-app-paths)) = 0.2.2 -# MIT Provides: bundled(golang(github.com/muesli/mango)) = 0.1.0 -# MIT Provides: bundled(golang(github.com/muesli/mango-cobra)) = 1.2.0 -# MIT Provides: bundled(golang(github.com/muesli/mango-pflag)) = 0.1.0 -# MIT Provides: bundled(golang(github.com/muesli/reflow)) = 0.3.0 -# MIT Provides: bundled(golang(github.com/muesli/roff)) = 0.1.0 -# MIT -Provides: bundled(golang(github.com/muesli/termenv)) = 98d742f -# MIT -Provides: bundled(golang(github.com/pelletier/go-toml/v2)) = 2.0.6 -# MIT +Provides: bundled(golang(github.com/muesli/termenv)) = 0.16.0 +Provides: bundled(golang(github.com/pelletier/go-toml/v2)) = 2.2.2 Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.7 -# MIT Provides: bundled(golang(github.com/sabhiram/go-gitignore)) = d310757 -# MIT +Provides: bundled(golang(github.com/sagikazarmark/locafero)) = 0.4.0 +Provides: bundled(golang(github.com/sagikazarmark/slog-shim)) = 0.1.0 Provides: bundled(golang(github.com/sahilm/fuzzy)) = 0.1.1 -# Apache-2.0 -Provides: bundled(golang(github.com/spf13/afero)) = 1.9.3 -# MIT -Provides: bundled(golang(github.com/spf13/cast)) = 1.5.0 -# Apache-2.0 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.7.0 -# MIT -Provides: bundled(golang(github.com/spf13/jwalterweatherman)) = 1.1.0 -# BSD-3-Clause -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 -# MIT -Provides: bundled(golang(github.com/spf13/viper)) = 1.15.0 -# MIT -Provides: bundled(golang(github.com/subosito/gotenv)) = 1.4.2 -# MIT -Provides: bundled(golang(github.com/xo/terminfo)) = abceb7e -# MIT +Provides: bundled(golang(github.com/sourcegraph/conc)) = 0.3.0 +Provides: bundled(golang(github.com/spf13/afero)) = 1.11.0 +Provides: bundled(golang(github.com/spf13/cast)) = 1.6.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 +Provides: bundled(golang(github.com/spf13/viper)) = 1.19.0 +Provides: bundled(golang(github.com/subosito/gotenv)) = 1.6.0 Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.4 -# MIT Provides: bundled(golang(github.com/yuin/goldmark-emoji)) = 1.0.3 -# BSD-3-Clause +Provides: bundled(golang(go.uber.org/atomic)) = 1.9.0 +Provides: bundled(golang(go.uber.org/multierr)) = 1.9.0 Provides: bundled(golang(golang.org/x/exp)) = fc45aab -# BSD-3-Clause Provides: bundled(golang(golang.org/x/net)) = 0.27.0 -# BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = 0.7.0 -# BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = 0.22.0 -# BSD-3-Clause -Provides: bundled(golang(golang.org/x/term)) = 0.22.0 -# BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = 0.16.0 -# Apache-2.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.11.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.30.0 +Provides: bundled(golang(golang.org/x/term)) = 0.29.0 +Provides: bundled(golang(golang.org/x/text)) = 0.22.0 Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0 -# Apache-2.0 AND MIT Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 @@ -159,16 +163,15 @@ files in subdirectories or a local Git repository. %prep -%autosetup -p 1 +%autosetup -p 1 -a 1 mkdir -p src/$(dirname %{goipath}) ln -s $PWD src/%{goipath} # set the program version -sed -e '/Version = / s/""/"%{version}"/' -i main.go +sed -e '/Version = / s/""/"v%{version}"/' -i main.go %build -export GO111MODULE=off export GOPATH=$PWD %gobuild -o bin/glow %{goipath} @@ -192,7 +195,7 @@ install -d -m 0755 %{buildroot}%{fish_completions_dir} %check # ensure that the version was embedded correctly -[[ "$(./bin/glow --version)" == "glow version %{version}" ]] || exit 1 +[[ "$(./bin/glow --version)" == "glow version v%{version}" ]] || exit 1 # run the upstream tests export GOPATH=$PWD diff --git a/sources b/sources index b96891f..59c97d2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (glow-2.0.0-vendored.tar.gz) = 0ffaab8c67f69983ea2ce958cc7c6f052f88e50bac26b3239c7ecfb94f935bee4327b61d6ffb01ed0fc233faa8c2ea3dc76a1ec00c93baec0bf0719b13b00c77 +SHA512 (glow-2.1.0.tar.gz) = 812c2cf05a145c55b41f22ca87f6763b39f77ec6bb636125c6a640d60d62f1a4880fcb9db1f2ac8d0c4e2fec1fb51779469ce8dd35f885609adb11170e3e45e9 +SHA512 (glow-2.1.0-vendor.tar.gz) = e82c1e4a1f6df31b5eb746d95bdd881ad02470e5ff20e21ff8e4df2a3717ab4531c3e354f20e5a580d4f06da1c62ecf6acc4d6225fbd88cebf1dc6aa0c9014ef From d180a8ab338782f2bf3957f705c7ab7ded64e1ea Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 18 Jun 2025 14:52:33 -0500 Subject: [PATCH 3/9] Update to version 2.1.1 rhbz#2369460 --- README.md | 3 -- create-vendor-tarball.sh | 2 +- glow.spec | 62 +++++++++++++++++++--------------------- sources | 4 +-- 4 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 0be7659..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# glow - -The glow package diff --git a/create-vendor-tarball.sh b/create-vendor-tarball.sh index ac0ea2f..d930bf4 100755 --- a/create-vendor-tarball.sh +++ b/create-vendor-tarball.sh @@ -9,8 +9,8 @@ fi set -euo pipefail -REPO="https://github.com/charmbracelet/glow" PKG="glow" +REPO="https://github.com/charmbracelet/$PKG" # transform tag into version # v2.0.0 -> 2.0.0 diff --git a/glow.spec b/glow.spec index 51d2fac..48c2627 100644 --- a/glow.spec +++ b/glow.spec @@ -1,7 +1,7 @@ %define goipath github.com/charmbracelet/glow Name: glow -Version: 2.1.0 +Version: 2.1.1 Release: %autorelease Summary: Terminal based markdown reader URL: https://github.com/charmbracelet/glow @@ -11,15 +11,11 @@ URL: https://github.com/charmbracelet/glow # github.com/inconshreveable/mousetrap # github.com/spf13/afero # github.com/spf13/cobra -# gopkg.in/ini.v1 -# BSD-2-Clause: -# github.com/magiconair/properties # BSD-3-Clause: # github.com/atotto/clipboard # github.com/fsnotify/fsnotify # github.com/gorilla/css # github.com/microcosm-cc/bluemonday -# github.com/sagikazarmark/slog-shim # github.com/spf13/pflag # golang.org/x/exp # golang.org/x/net @@ -33,22 +29,25 @@ URL: https://github.com/charmbracelet/glow # github.com/caarlos0/env/v11 # github.com/charmbracelet/bubbles # github.com/charmbracelet/bubbletea +# github.com/charmbracelet/colorprofile # github.com/charmbracelet/glamour # github.com/charmbracelet/lipgloss # github.com/charmbracelet/log # github.com/charmbracelet/x/ansi +# github.com/charmbracelet/x/cellbuf # github.com/charmbracelet/x/editor +# github.com/charmbracelet/x/exp/slice # github.com/charmbracelet/x/term # github.com/dlclark/regexp2 # github.com/dustin/go-humanize # github.com/erikgeiser/coninput # github.com/go-logfmt/logfmt +# github.com/go-viper/mapstructure/v2 # github.com/lucasb-eyer/go-colorful # github.com/mattn/go-isatty # github.com/mattn/go-localereader # github.com/mattn/go-runewidth # github.com/mitchellh/go-homedir -# github.com/mitchellh/mapstructure # github.com/muesli/ansi # github.com/muesli/cancelreader # github.com/muesli/gitcha @@ -68,17 +67,16 @@ URL: https://github.com/charmbracelet/glow # github.com/spf13/cast # github.com/spf13/viper # github.com/subosito/gotenv +# github.com/xo/terminfo # github.com/yuin/goldmark # github.com/yuin/goldmark-emoji # go.uber.org/atomic # go.uber.org/multierr -# MPL-2.0: -# github.com/hashicorp/hcl # Apache-2.0 AND MIT # gopkg.in/yaml.v3 # MIT AND OFL-1.1: # github.com/alecthomas/chroma/v2 -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND OFL-1.1 +License: Apache-2.0 AND BSD-3-Clause AND MIT AND OFL-1.1 Source0: %{url}/archive/v%{version}/glow-%{version}.tar.gz Source1: glow-%{version}-vendor.tar.gz @@ -94,30 +92,31 @@ Provides: bundled(golang(github.com/atotto/clipboard)) = 0.1.4 Provides: bundled(golang(github.com/aymanbagabas/go-osc52/v2)) = 2.0.1 Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0 Provides: bundled(golang(github.com/caarlos0/env/v11)) = 11.3.1 -Provides: bundled(golang(github.com/charmbracelet/bubbles)) = 0.20.0 -Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = 1.3.3 -Provides: bundled(golang(github.com/charmbracelet/glamour)) = 0.8.0 -Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 1.0.0 -Provides: bundled(golang(github.com/charmbracelet/log)) = 0.4.0 +Provides: bundled(golang(github.com/charmbracelet/bubbles)) = 0.21.0 +Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = 1.3.5 +Provides: bundled(golang(github.com/charmbracelet/colorprofile)) = f60798e +Provides: bundled(golang(github.com/charmbracelet/glamour)) = 0.10.0 +Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 76690c6 +Provides: bundled(golang(github.com/charmbracelet/log)) = 0.4.2 Provides: bundled(golang(github.com/charmbracelet/x/ansi)) = 0.8.0 +Provides: bundled(golang(github.com/charmbracelet/x/cellbuf)) = 0.0.13 Provides: bundled(golang(github.com/charmbracelet/x/editor)) = 0.1.0 +Provides: bundled(golang(github.com/charmbracelet/x/exp/slice)) = 2fdc977 Provides: bundled(golang(github.com/charmbracelet/x/term)) = 0.2.1 Provides: bundled(golang(github.com/dlclark/regexp2)) = 1.11.0 Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.1 Provides: bundled(golang(github.com/erikgeiser/coninput)) = 1c3628e -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.8.0 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 1.9.0 Provides: bundled(golang(github.com/go-logfmt/logfmt)) = 0.6.0 +Provides: bundled(golang(github.com/go-viper/mapstructure/v2)) = 2.2.1 Provides: bundled(golang(github.com/gorilla/css)) = 1.0.1 -Provides: bundled(golang(github.com/hashicorp/hcl)) = 1.0.0 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 Provides: bundled(golang(github.com/lucasb-eyer/go-colorful)) = 1.2.0 -Provides: bundled(golang(github.com/magiconair/properties)) = 1.8.7 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 Provides: bundled(golang(github.com/mattn/go-localereader)) = 0.0.1 Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.16 Provides: bundled(golang(github.com/microcosm-cc/bluemonday)) = 1.0.27 Provides: bundled(golang(github.com/mitchellh/go-homedir)) = 1.1.0 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.5.0 Provides: bundled(golang(github.com/muesli/ansi)) = 276c624 Provides: bundled(golang(github.com/muesli/cancelreader)) = 0.2.2 Provides: bundled(golang(github.com/muesli/gitcha)) = 0.3.0 @@ -128,30 +127,29 @@ Provides: bundled(golang(github.com/muesli/mango-pflag)) = 0.1.0 Provides: bundled(golang(github.com/muesli/reflow)) = 0.3.0 Provides: bundled(golang(github.com/muesli/roff)) = 0.1.0 Provides: bundled(golang(github.com/muesli/termenv)) = 0.16.0 -Provides: bundled(golang(github.com/pelletier/go-toml/v2)) = 2.2.2 +Provides: bundled(golang(github.com/pelletier/go-toml/v2)) = 2.2.3 Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.7 Provides: bundled(golang(github.com/sabhiram/go-gitignore)) = d310757 -Provides: bundled(golang(github.com/sagikazarmark/locafero)) = 0.4.0 -Provides: bundled(golang(github.com/sagikazarmark/slog-shim)) = 0.1.0 +Provides: bundled(golang(github.com/sagikazarmark/locafero)) = 0.7.0 Provides: bundled(golang(github.com/sahilm/fuzzy)) = 0.1.1 Provides: bundled(golang(github.com/sourcegraph/conc)) = 0.3.0 -Provides: bundled(golang(github.com/spf13/afero)) = 1.11.0 -Provides: bundled(golang(github.com/spf13/cast)) = 1.6.0 +Provides: bundled(golang(github.com/spf13/afero)) = 1.12.0 +Provides: bundled(golang(github.com/spf13/cast)) = 1.7.1 Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 -Provides: bundled(golang(github.com/spf13/viper)) = 1.19.0 +Provides: bundled(golang(github.com/spf13/viper)) = 1.20.1 Provides: bundled(golang(github.com/subosito/gotenv)) = 1.6.0 -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.4 -Provides: bundled(golang(github.com/yuin/goldmark-emoji)) = 1.0.3 +Provides: bundled(golang(github.com/xo/terminfo)) = abceb7e +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 +Provides: bundled(golang(github.com/yuin/goldmark-emoji)) = 1.0.5 Provides: bundled(golang(go.uber.org/atomic)) = 1.9.0 Provides: bundled(golang(go.uber.org/multierr)) = 1.9.0 Provides: bundled(golang(golang.org/x/exp)) = fc45aab -Provides: bundled(golang(golang.org/x/net)) = 0.27.0 -Provides: bundled(golang(golang.org/x/sync)) = 0.11.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.30.0 -Provides: bundled(golang(golang.org/x/term)) = 0.29.0 -Provides: bundled(golang(golang.org/x/text)) = 0.22.0 -Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0 +Provides: bundled(golang(golang.org/x/net)) = 0.40.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.14.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.33.0 +Provides: bundled(golang(golang.org/x/term)) = 0.32.0 +Provides: bundled(golang(golang.org/x/text)) = 0.25.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 diff --git a/sources b/sources index 59c97d2..0a44534 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (glow-2.1.0.tar.gz) = 812c2cf05a145c55b41f22ca87f6763b39f77ec6bb636125c6a640d60d62f1a4880fcb9db1f2ac8d0c4e2fec1fb51779469ce8dd35f885609adb11170e3e45e9 -SHA512 (glow-2.1.0-vendor.tar.gz) = e82c1e4a1f6df31b5eb746d95bdd881ad02470e5ff20e21ff8e4df2a3717ab4531c3e354f20e5a580d4f06da1c62ecf6acc4d6225fbd88cebf1dc6aa0c9014ef +SHA512 (glow-2.1.1.tar.gz) = 6a01ff0f9c29de28f55a467fc2041afbe6bd25b06053da9fc62fa73e800c05a452b695e242e8605ef686f72a3f048ef6e2cd7206530e356a6cad669ac4c57a10 +SHA512 (glow-2.1.1-vendor.tar.gz) = c9c03aeedfcf19162954c07c7e6aed1d2b5ef886ea74db57c398ddb53139c1c10c706f507d6429e89533a5144580446c8baef0e350e24b5dce5ce22cb383ebd5 From 746f19ce9b69cf269dce32f3b772cc6ce1f4d4ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:35:18 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 87b535612d61501dbc8db71e7384a4f4f57a94be Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Mon, 13 Jan 2025 21:08:10 +0100 Subject: [PATCH 5/9] Set the correct goipath --- glow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glow.spec b/glow.spec index 48c2627..f0443df 100644 --- a/glow.spec +++ b/glow.spec @@ -1,4 +1,4 @@ -%define goipath github.com/charmbracelet/glow +%define goipath github.com/charmbracelet/glow/v2 Name: glow Version: 2.1.1 From 7dc60fb054df25b994dd9fec2b003e840daa30fe Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:42:06 -0500 Subject: [PATCH 6/9] Rebuild for golang-1.25.0 --- glow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glow.spec b/glow.spec index f0443df..4b2263d 100644 --- a/glow.spec +++ b/glow.spec @@ -2,7 +2,7 @@ Name: glow Version: 2.1.1 -Release: %autorelease +Release: %autorelease.1 Summary: Terminal based markdown reader URL: https://github.com/charmbracelet/glow @@ -211,4 +211,7 @@ cd src/%{goipath} %changelog +* Fri Aug 15 2025 Maxwell G - 2.1.1-1.1 +- Rebuild for golang-1.25.0 + %autochangelog From 677d60131d4a39fa564734ddb4cc5664383d28c2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 15:32:36 -0500 Subject: [PATCH 7/9] Revert "Rebuild for golang-1.25.0" This reverts commit 7dc60fb054df25b994dd9fec2b003e840daa30fe. --- glow.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/glow.spec b/glow.spec index 4b2263d..f0443df 100644 --- a/glow.spec +++ b/glow.spec @@ -2,7 +2,7 @@ Name: glow Version: 2.1.1 -Release: %autorelease.1 +Release: %autorelease Summary: Terminal based markdown reader URL: https://github.com/charmbracelet/glow @@ -211,7 +211,4 @@ cd src/%{goipath} %changelog -* Fri Aug 15 2025 Maxwell G - 2.1.1-1.1 -- Rebuild for golang-1.25.0 - %autochangelog From 1f0fc0aa4e2d5a43795505aae2a467fa1a978444 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 16:18:53 -0500 Subject: [PATCH 8/9] Rebuild for golang-1.25.0 From 6bbb542ed816948e5d069d2ad6b580b8144df30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 13:21:03 +0200 Subject: [PATCH 9/9] rebuild