From 227f80a966894090a2f68b625e9c58b6fb5f1e59 Mon Sep 17 00:00:00 2001 From: ut001695 Date: Thu, 29 Jul 2021 20:27:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dgrafana=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E6=97=B6=E9=97=B4=E8=A3=85=E5=8C=85?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ut001695 --- fix_version_dismatch_issue.patch | 12 ++++++++++++ grafana.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix_version_dismatch_issue.patch diff --git a/fix_version_dismatch_issue.patch b/fix_version_dismatch_issue.patch new file mode 100644 index 0000000..fb7fb09 --- /dev/null +++ b/fix_version_dismatch_issue.patch @@ -0,0 +1,12 @@ +--- ./pkg/cmd/grafana-server/main.go.orig 2021-04-23 11:48:25.848723176 +0800 ++++ ./pkg/cmd/grafana-server/main.go 2021-04-23 11:48:43.112707885 +0800 +@@ -32,7 +32,7 @@ + _ "github.com/grafana/grafana/pkg/tsdb/testdatasource" + ) + +-var version = "5.0.0" ++var version = "6.7.4" + var commit = "NA" + var buildBranch = "master" + var buildstamp string + diff --git a/grafana.spec b/grafana.spec index 4b8cc8c..1328ca2 100644 --- a/grafana.spec +++ b/grafana.spec @@ -13,7 +13,7 @@ end} Name: grafana Version: 6.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -36,6 +36,7 @@ Source4: list_go_buildrequires.sh # Source5 is the script to generate the list of bundled nodejs packages Source5: list_bundled_nodejs_packages.py +Patch0: fix_version_dismatch_issue.patch # Intersection of go_arches and nodejs_arches ExclusiveArch: aarch64 x86_64 @@ -227,6 +228,7 @@ The Grafana stackdriver datasource. %prep %setup -q -T -D -b 0 %setup -q -T -D -b 1 +%patch0 -p1 # Set up build subdirs and links mkdir -p %{_builddir}/src/github.com/grafana @@ -459,5 +461,8 @@ go test ./pkg/... %changelog +* Thu Jul 29 2021 zhangkea - 6.7.4-2 +- Fix version display issue + * Tue Aug 11 2020 houjian - 6.7.4-1 - Package init -- Gitee