diff --git a/.gitignore b/.gitignore index f5ddba1..d0608a7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /toolbox-0.0.94.tar.xz /toolbox-0.0.95.tar.xz /toolbox-0.0.96.tar.xz +/toolbox-0.0.97.tar.xz diff --git a/sources b/sources index 0650a35..590ca40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (toolbox-0.0.96.tar.xz) = 843d6c8e0c4784bc89bc5ca6042fff44b8be1f71a4d424ffd82d0900af788fcdd985476cb48680f9817dc8f5f8586a34ff3d97e00ade5afe3107f3b2ca53b04d +SHA512 (toolbox-0.0.97.tar.xz) = e8c9b3713346a8e1ecabda4518af3955ca2b729a7a99000b15ac8275243d81d5eb53a8accb876f89ef7320ea8bc6e683547ae5cd027ee5e5054494032727f85d diff --git a/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch b/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch index 537dfbb..a39257b 100644 --- a/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch +++ b/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch @@ -1,4 +1,4 @@ -From deac27651c22ad6e3a4045706c4c35292df736e8 Mon Sep 17 00:00:00 2001 +From 4039c49b0cd2111cd1c505b9a9aef25aeebb6a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harry=20M=C3=ADchal?= Date: Sat, 27 Jun 2020 16:17:56 +0200 Subject: [PATCH] Don't use Go's semantic import versioning @@ -15,7 +15,7 @@ https://github.com/containers/toolbox/pull/484 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmd/create.go b/src/cmd/create.go -index 0b78572f4e5c..0b8c30f40297 100644 +index 50938890b22f..29bc0f2c42f7 100644 --- a/src/cmd/create.go +++ b/src/cmd/create.go @@ -28,7 +28,7 @@ import ( @@ -28,25 +28,25 @@ index 0b78572f4e5c..0b8c30f40297 100644 "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/src/go.mod b/src/go.mod -index 2b1ac3018c8d..e8c4452c341d 100644 +index 219d3d578992..7e1a6807fd7e 100644 --- a/src/go.mod +++ b/src/go.mod -@@ -7,7 +7,7 @@ require ( - github.com/acobaugh/osrelease v0.0.0-20181218015638-a93a0a55a249 +@@ -8,7 +8,7 @@ require ( github.com/briandowns/spinner v1.10.0 github.com/docker/go-units v0.4.0 + github.com/fsnotify/fsnotify v1.4.7 - github.com/godbus/dbus/v5 v5.0.3 + github.com/godbus/dbus v4.1.0+incompatible + github.com/mattn/go-isatty v0.0.8 github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 - golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 diff --git a/src/go.sum b/src/go.sum -index 4d6a0034d990..3b33ef9faec8 100644 +index 5a03a6823698..d9ce63604fcf 100644 --- a/src/go.sum +++ b/src/go.sum -@@ -17,8 +17,8 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD - github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +@@ -18,8 +18,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= + github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -56,7 +56,7 @@ index 4d6a0034d990..3b33ef9faec8 100644 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go -index 634d981e8967..db60739271cf 100644 +index 5455298cbce4..3f7fc26147fc 100644 --- a/src/pkg/utils/utils.go +++ b/src/pkg/utils/utils.go @@ -33,7 +33,7 @@ import ( diff --git a/toolbox.spec b/toolbox.spec index bdb8a16..b23f42f 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -1,5 +1,5 @@ Name: toolbox -Version: 0.0.96 +Version: 0.0.97 %global goipath github.com/containers/%{name} %gometa @@ -23,6 +23,7 @@ BuildRequires: golang(github.com/HarryMichal/go-version) BuildRequires: golang(github.com/acobaugh/osrelease) BuildRequires: golang(github.com/briandowns/spinner) >= 1.10.0 BuildRequires: golang(github.com/docker/go-units) >= 0.4.0 +BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.4.7 BuildRequires: golang(github.com/godbus/dbus) >= 5.0.3 BuildRequires: golang(github.com/mattn/go-isatty) >= 0.0.12 BuildRequires: golang(github.com/sirupsen/logrus) >= 1.4.2 @@ -168,6 +169,9 @@ ln -s src/pkg pkg %changelog +* Tue Nov 03 2020 Debarshi Ray - 0.0.97-1 +- Update to 0.0.97 + * Thu Oct 01 2020 Debarshi Ray - 0.0.96-1 - Update to 0.0.96