rpms/grafana
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update source hashes and minor updates to 007 patch

Browse Source
This commit is contained in:
Andreas Gerstmayr 2021-05-25 18:22:57 +02:00
parent 4998b969b6
commit f969f20576
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
007-remove-duplicate-grafana-aws-sdk-dependency.patch
View File

@ -1,8 +1,8 @@
diff --git a/go.mod b/go.mod diff --git a/go.mod b/go.mod
index 2161850265..ce22895fde 100644 index 2161850265..db36c1ceed 100644
--- a/go.mod --- a/go.mod
+++ b/go.mod +++ b/go.mod
@@ -43,7 +43,6 @@ require ( @@ -42,7 +42,6 @@ require (
github.com/google/go-cmp v0.5.4 github.com/google/go-cmp v0.5.4
github.com/google/uuid v1.2.0 github.com/google/uuid v1.2.0
github.com/gosimple/slug v1.9.0 github.com/gosimple/slug v1.9.0

2
Makefile
View File

@ -11,7 +11,7 @@ grafana-vendor-$(VER).tar.xz: grafana-$(VER).tar.gz
# patches can affect Go or Node.js dependencies # patches can affect Go or Node.js dependencies
cd grafana-$(VER) && shopt -s nullglob && \ cd grafana-$(VER) && shopt -s nullglob && \
for patch in ../*.patch; do patch -p1 < $$patch; done for patch in ../*.patch; do patch -p1 --fuzz=0 < $$patch; done
# Go # Go
cd grafana-$(VER) && go mod vendor -v cd grafana-$(VER) && go mod vendor -v

2
grafana.spec
View File

@ -65,7 +65,7 @@ Patch7: 007-remove-duplicate-grafana-aws-sdk-dependency.patch
# Intersection of go_arches and nodejs_arches # Intersection of go_arches and nodejs_arches
ExclusiveArch: %{grafana_arches} ExclusiveArch: %{grafana_arches}
BuildRequires: git, systemd, golang, go-srpm-macros BuildRequires: systemd, golang, go-srpm-macros
%if 0%{?fedora} >= 31 %if 0%{?fedora} >= 31
BuildRequires: go-rpm-macros BuildRequires: go-rpm-macros
%endif %endif

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (grafana-7.3.6.tar.gz) = c500565c6cd7b7f3a7d8c1d4924b9ba576db2a765ad184e9bd32373ebbb8792c1812b6c866ba652634f134105af59ddaf023f0da44c067bb77112bcd431a30b4 SHA512 (grafana-7.5.7.tar.gz) = e8adbfffca91bfb43cf810b9e6b0fa6a0abe765ae4a45f6a1add09c35b1a5bc1f241dc91fad69669b437bfcd107b46f7a09bee9d3272670aaf6e4e501a84edec
SHA512 (grafana-webpack-7.3.6.tar.gz) = 83ac952ff3870625450badbe42edcfdde45d142e31825e8cfe556b56c6c6d81776e46c0efc8ba9ca9ce49ab939ea998b563caba33ab438324dec7e696d30bb05 SHA512 (grafana-webpack-7.5.7.tar.gz) = 0a40019e859f5c658d6cc25df9504ca350bda48bd2641a87a5efdd9244b7644e19f84d035ca3b4c90263d16d39029b762bed0f3ac00496a27601255fa1437031
SHA512 (grafana-vendor-7.3.6.tar.xz) = 46879283457f41225e41854ea1908dd3718dbbc5c2a5cace6d775de71ce225be2fcdd50fa8a244335486d390a0b38dfce1f05202ac7f6730a8c3e4e2812ab7d7 SHA512 (grafana-vendor-7.5.7.tar.xz) = 19a90e6cc7442b7575a1de035441d3b0dd8a347cddd766ad161b4f5e409fdf20cdf68d0cf8dfcd377ea150e800bbe79f5012b161882b014fbb102a128399f3ea