diff --git a/fix_version_dismatch_issue.patch b/fix_version_dismatch_issue.patch new file mode 100644 index 0000000000000000000000000000000000000000..fb7fb09c8db94517e52d394b605deea025ba5910 --- /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 4b8cc8c54c742a6872b8bdcc8fac66f3383b13fa..1328ca23303ffcabc656f4857793ca0ce13609e8 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