From 1c3069180fcd4cfb6a4a348e8c485b4ba77fd9ef51fd75c10bbdf834cc8090a5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 1 Jun 2023 16:23:23 +0000 Subject: [PATCH 1/2] Accepting request 1089929 from home:smolsheep:upgrades - Update to version 1.5.1: - docs: fix typos by @kianmeng in #471 - fix: rm emoji from package description by @caarlos0 in #453 - fix: improve editor handling by @caarlos0 in #449 - fix: lazily init UI by @muesli in #494 - fix-for-go-117.patch added as vendoring was incorrect OBS-URL: https://build.opensuse.org/request/show/1089929 OBS-URL: https://build.opensuse.org/package/show/utilities/glow?expand=0&rev=9 --- _service | 5 ++-- fix-for-go-117.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++ glow-1.5.1.tar.zst | 3 +++ glow.changes | 12 +++++++++ glow.spec | 9 ++++--- vendor.tar.zst | 4 +-- 6 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 fix-for-go-117.patch create mode 100644 glow-1.5.1.tar.zst diff --git a/_service b/_service index 4ba5a6b..beece07 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/charmbracelet/glow git .git - v1.4.1 + v1.5.1 @PARENT_TAG@ v(.*) @@ -12,8 +12,9 @@ *.tar - gz + zst + zst diff --git a/fix-for-go-117.patch b/fix-for-go-117.patch new file mode 100644 index 0000000..d319058 --- /dev/null +++ b/fix-for-go-117.patch @@ -0,0 +1,58 @@ +--- a/go.mod 2023-05-30 21:34:02.914986538 -0400 ++++ b/go.mod 2023-05-30 21:33:56.099249432 -0400 +@@ -1,6 +1,6 @@ + module github.com/charmbracelet/glow + +-go 1.16 ++go 1.17 + + require ( + github.com/atotto/clipboard v0.1.4 +@@ -25,3 +25,47 @@ + golang.org/x/term v0.7.0 + golang.org/x/text v0.9.0 + ) ++ ++require ( ++ github.com/alecthomas/chroma v0.10.0 // indirect ++ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect ++ github.com/aymerick/douceur v0.2.0 // indirect ++ github.com/calmh/randomart v1.1.0 // indirect ++ github.com/containerd/console v1.0.3 // indirect ++ github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect ++ github.com/dlclark/regexp2 v1.4.0 // indirect ++ github.com/fsnotify/fsnotify v1.6.0 // indirect ++ github.com/google/uuid v1.3.0 // indirect ++ github.com/gorilla/css v1.0.0 // indirect ++ github.com/hashicorp/hcl v1.0.0 // indirect ++ github.com/inconshreveable/mousetrap v1.0.1 // indirect ++ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect ++ github.com/magiconair/properties v1.8.6 // indirect ++ github.com/mattn/go-isatty v0.0.18 // indirect ++ github.com/mattn/go-localereader v0.0.1 // indirect ++ github.com/microcosm-cc/bluemonday v1.0.21 // indirect ++ github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect ++ github.com/mitchellh/mapstructure v1.5.0 // indirect ++ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect ++ github.com/muesli/cancelreader v0.2.2 // indirect ++ github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a // indirect ++ github.com/olekukonko/tablewriter v0.0.5 // indirect ++ github.com/pelletier/go-toml v1.9.5 // indirect ++ github.com/pelletier/go-toml/v2 v2.0.5 // indirect ++ github.com/rivo/uniseg v0.2.0 // indirect ++ github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect ++ github.com/spf13/afero v1.9.2 // indirect ++ github.com/spf13/cast v1.5.0 // indirect ++ github.com/spf13/jwalterweatherman v1.1.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ github.com/subosito/gotenv v1.4.1 // indirect ++ github.com/yuin/goldmark v1.5.2 // indirect ++ github.com/yuin/goldmark-emoji v1.0.1 // indirect ++ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect ++ golang.org/x/net v0.6.0 // indirect ++ golang.org/x/sync v0.1.0 // indirect ++ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ++ gopkg.in/ini.v1 v1.67.0 // indirect ++ gopkg.in/yaml.v2 v2.4.0 // indirect ++ gopkg.in/yaml.v3 v3.0.1 // indirect ++) diff --git a/glow-1.5.1.tar.zst b/glow-1.5.1.tar.zst new file mode 100644 index 0000000..14ea56c --- /dev/null +++ b/glow-1.5.1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d0f09b2344e6fa0721a802480636bbaefb235f8d71cc84d6c413d8f5c9daaa6 +size 555756 diff --git a/glow.changes b/glow.changes index 4a5599d..6e8c33b 100644 --- a/glow.changes +++ b/glow.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 31 02:04:53 UTC 2023 - Joshua Smith + +- Update to version 1.5.1: + - docs: fix typos by @kianmeng in #471 + - fix: rm emoji from package description by @caarlos0 in #453 + - fix: improve editor handling by @caarlos0 in #449 + - fix: lazily init UI by @muesli in #494 + - fix-for-go-117.patch added as vendoring was incorrect + Ran the patch against the source before manually doing + go mod download/verify/vendor and packaging. + ------------------------------------------------------------------- Thu Mar 9 17:01:01 UTC 2023 - Soc Virnyl Estela diff --git a/glow.spec b/glow.spec index 473c96d..32bcfb8 100644 --- a/glow.spec +++ b/glow.spec @@ -20,7 +20,7 @@ # Disable LTO flags to stop builds failing on some architectures %global _lto_cflags %nil Name: glow -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: Render markdown on the CLI # @@ -35,9 +35,10 @@ Source1: vendor.tar.zst # Source2: README.suse-maint.md # -BuildRequires: zstd +Patch1: fix-for-go-117.patch BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.11 +BuildRequires: zstd +BuildRequires: golang(API) >= 1.17 %description Glow is a terminal based markdown reader designed from the ground up to bring @@ -60,7 +61,7 @@ BUILDMOD="-buildmode=pie" export CGO_CFLAGS="%{optflags}" export CGO_CXXFLAGS="%{optflags}" export CGO_CPPFLAGS="%{optflags}" -go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.revision=%{version}" +go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.Version=%{version}" %install install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} diff --git a/vendor.tar.zst b/vendor.tar.zst index ef98539..77fa0c0 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d418838be4d455bc2c17781b496f39d34d845d5b49a39f3d586eb5904b2b14b -size 3303903 +oid sha256:78722d5f9371143fbb23f7e50117c276c37c3b25bea550bb0ae1c7870118487d +size 3243148 From 3bf5b7f40c3d8849977f3666f4e9c267771fd4a2c70e214bdb97b96a4f8b1093 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 4 Jun 2023 12:02:20 +0000 Subject: [PATCH 2/2] Accepting request 1090696 from home:smolsheep:upgrades This should hopefully adhere more closely to the previous request. OBS-URL: https://build.opensuse.org/request/show/1090696 OBS-URL: https://build.opensuse.org/package/show/utilities/glow?expand=0&rev=10 --- _service | 2 +- fix-for-go-117.patch | 58 -------------------------------------------- glow-1.5.1.tar.gz | 3 +++ glow-1.5.1.tar.zst | 3 --- glow.changes | 12 --------- glow.spec | 9 +++---- vendor.tar.zst | 4 +-- 7 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 fix-for-go-117.patch create mode 100644 glow-1.5.1.tar.gz delete mode 100644 glow-1.5.1.tar.zst diff --git a/_service b/_service index beece07..e61c9e1 100644 --- a/_service +++ b/_service @@ -12,7 +12,7 @@ *.tar - zst + gz zst diff --git a/fix-for-go-117.patch b/fix-for-go-117.patch deleted file mode 100644 index d319058..0000000 --- a/fix-for-go-117.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/go.mod 2023-05-30 21:34:02.914986538 -0400 -+++ b/go.mod 2023-05-30 21:33:56.099249432 -0400 -@@ -1,6 +1,6 @@ - module github.com/charmbracelet/glow - --go 1.16 -+go 1.17 - - require ( - github.com/atotto/clipboard v0.1.4 -@@ -25,3 +25,47 @@ - golang.org/x/term v0.7.0 - golang.org/x/text v0.9.0 - ) -+ -+require ( -+ github.com/alecthomas/chroma v0.10.0 // indirect -+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect -+ github.com/aymerick/douceur v0.2.0 // indirect -+ github.com/calmh/randomart v1.1.0 // indirect -+ github.com/containerd/console v1.0.3 // indirect -+ github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect -+ github.com/dlclark/regexp2 v1.4.0 // indirect -+ github.com/fsnotify/fsnotify v1.6.0 // indirect -+ github.com/google/uuid v1.3.0 // indirect -+ github.com/gorilla/css v1.0.0 // indirect -+ github.com/hashicorp/hcl v1.0.0 // indirect -+ github.com/inconshreveable/mousetrap v1.0.1 // indirect -+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect -+ github.com/magiconair/properties v1.8.6 // indirect -+ github.com/mattn/go-isatty v0.0.18 // indirect -+ github.com/mattn/go-localereader v0.0.1 // indirect -+ github.com/microcosm-cc/bluemonday v1.0.21 // indirect -+ github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect -+ github.com/mitchellh/mapstructure v1.5.0 // indirect -+ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect -+ github.com/muesli/cancelreader v0.2.2 // indirect -+ github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a // indirect -+ github.com/olekukonko/tablewriter v0.0.5 // indirect -+ github.com/pelletier/go-toml v1.9.5 // indirect -+ github.com/pelletier/go-toml/v2 v2.0.5 // indirect -+ github.com/rivo/uniseg v0.2.0 // indirect -+ github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect -+ github.com/spf13/afero v1.9.2 // indirect -+ github.com/spf13/cast v1.5.0 // indirect -+ github.com/spf13/jwalterweatherman v1.1.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ github.com/subosito/gotenv v1.4.1 // indirect -+ github.com/yuin/goldmark v1.5.2 // indirect -+ github.com/yuin/goldmark-emoji v1.0.1 // indirect -+ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect -+ golang.org/x/net v0.6.0 // indirect -+ golang.org/x/sync v0.1.0 // indirect -+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+ gopkg.in/ini.v1 v1.67.0 // indirect -+ gopkg.in/yaml.v2 v2.4.0 // indirect -+ gopkg.in/yaml.v3 v3.0.1 // indirect -+) diff --git a/glow-1.5.1.tar.gz b/glow-1.5.1.tar.gz new file mode 100644 index 0000000..522c841 --- /dev/null +++ b/glow-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4ecf269b7c6447e19591b1d23f398ef2b38a6a75be68458390b42d3efc44b92 +size 553842 diff --git a/glow-1.5.1.tar.zst b/glow-1.5.1.tar.zst deleted file mode 100644 index 14ea56c..0000000 --- a/glow-1.5.1.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d0f09b2344e6fa0721a802480636bbaefb235f8d71cc84d6c413d8f5c9daaa6 -size 555756 diff --git a/glow.changes b/glow.changes index 6e8c33b..4a5599d 100644 --- a/glow.changes +++ b/glow.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Wed May 31 02:04:53 UTC 2023 - Joshua Smith - -- Update to version 1.5.1: - - docs: fix typos by @kianmeng in #471 - - fix: rm emoji from package description by @caarlos0 in #453 - - fix: improve editor handling by @caarlos0 in #449 - - fix: lazily init UI by @muesli in #494 - - fix-for-go-117.patch added as vendoring was incorrect - Ran the patch against the source before manually doing - go mod download/verify/vendor and packaging. - ------------------------------------------------------------------- Thu Mar 9 17:01:01 UTC 2023 - Soc Virnyl Estela diff --git a/glow.spec b/glow.spec index 32bcfb8..473c96d 100644 --- a/glow.spec +++ b/glow.spec @@ -20,7 +20,7 @@ # Disable LTO flags to stop builds failing on some architectures %global _lto_cflags %nil Name: glow -Version: 1.5.1 +Version: 1.5.0 Release: 0 Summary: Render markdown on the CLI # @@ -35,10 +35,9 @@ Source1: vendor.tar.zst # Source2: README.suse-maint.md # -Patch1: fix-for-go-117.patch -BuildRequires: golang-packaging BuildRequires: zstd -BuildRequires: golang(API) >= 1.17 +BuildRequires: golang-packaging +BuildRequires: golang(API) >= 1.11 %description Glow is a terminal based markdown reader designed from the ground up to bring @@ -61,7 +60,7 @@ BUILDMOD="-buildmode=pie" export CGO_CFLAGS="%{optflags}" export CGO_CXXFLAGS="%{optflags}" export CGO_CPPFLAGS="%{optflags}" -go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.Version=%{version}" +go build -v -x -mod=vendor $BUILDMOD -a -ldflags "-s -X main.revision=%{version}" %install install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} diff --git a/vendor.tar.zst b/vendor.tar.zst index 77fa0c0..ef98539 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78722d5f9371143fbb23f7e50117c276c37c3b25bea550bb0ae1c7870118487d -size 3243148 +oid sha256:9d418838be4d455bc2c17781b496f39d34d845d5b49a39f3d586eb5904b2b14b +size 3303903