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
This commit is contained in:
Andreas Schneider 2023-06-01 16:23:23 +00:00 committed by Git OBS Bridge
parent 5c465405f0
commit 1c3069180f
6 changed files with 83 additions and 8 deletions

View File

@ -3,7 +3,7 @@
<param name="url">https://github.com/charmbracelet/glow</param> <param name="url">https://github.com/charmbracelet/glow</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="revision">v1.4.1</param> <param name="revision">v1.5.1</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-pattern">v(.*)</param>
</service> </service>
@ -12,8 +12,9 @@
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">gz</param> <param name="compression">zst</param>
</service> </service>
<service name="go_modules" mode="disabled"> <service name="go_modules" mode="disabled">
<param name="compression">zst</param>
</service> </service>
</services> </services>

58
fix-for-go-117.patch Normal file
View File

@ -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
+)

3
glow-1.5.1.tar.zst Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d0f09b2344e6fa0721a802480636bbaefb235f8d71cc84d6c413d8f5c9daaa6
size 555756

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed May 31 02:04:53 UTC 2023 - Joshua Smith <jsmithfpv@gmail.com>
- 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 <socvirnyl.estela@gmail.com> Thu Mar 9 17:01:01 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>

View File

@ -20,7 +20,7 @@
# Disable LTO flags to stop builds failing on some architectures # Disable LTO flags to stop builds failing on some architectures
%global _lto_cflags %nil %global _lto_cflags %nil
Name: glow Name: glow
Version: 1.5.0 Version: 1.5.1
Release: 0 Release: 0
Summary: Render markdown on the CLI Summary: Render markdown on the CLI
# #
@ -35,9 +35,10 @@ Source1: vendor.tar.zst
# #
Source2: README.suse-maint.md Source2: README.suse-maint.md
# #
BuildRequires: zstd Patch1: fix-for-go-117.patch
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.11 BuildRequires: zstd
BuildRequires: golang(API) >= 1.17
%description %description
Glow is a terminal based markdown reader designed from the ground up to bring 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_CFLAGS="%{optflags}"
export CGO_CXXFLAGS="%{optflags}" export CGO_CXXFLAGS="%{optflags}"
export CGO_CPPFLAGS="%{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
install -Dm755 %{name} %{buildroot}%{_bindir}/%{name} install -Dm755 %{name} %{buildroot}%{_bindir}/%{name}

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9d418838be4d455bc2c17781b496f39d34d845d5b49a39f3d586eb5904b2b14b oid sha256:78722d5f9371143fbb23f7e50117c276c37c3b25bea550bb0ae1c7870118487d
size 3303903 size 3243148