diff --git a/README.md b/README.md index 688f9ee..cdfcf17 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The grafana package ## Upgrade instructions (replace X.Y.Z with the new Grafana version) -* update `Version`, `commit` and `%changelog` in the specfile +* update `Version` and `%changelog` in the specfile * download source tarball and create webpack: `./make_grafana_webpack.sh X.Y.Z` * update golang buildrequires: `./scripts/list_go_buildrequires.sh grafana-X.Y.Z` and replace the old golang `BuildRequires:` with the new ones * update nodejs provides: `./scripts/list_bundled_nodejs_packages.py grafana-X.Y.Z` and replace the old nodejs `Provides:` with the new ones diff --git a/grafana.spec b/grafana.spec index 07a0387..cfe2ab8 100644 --- a/grafana.spec +++ b/grafana.spec @@ -16,7 +16,6 @@ end} Name: grafana Version: 6.7.3 -%global commit a04ef6c Release: 1%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 @@ -393,7 +392,7 @@ export GOPATH=%{_builddir}:%{gopath} export GO111MODULE=off; rm -f go.mod # see grafana-X.X.X/build.go -export LDFLAGS="-X main.version=%{version} -X main.commit=%{commit} -X main.buildstamp=${SOURCE_DATE_EPOCH} -X main.buildBranch=master" +export LDFLAGS="-X main.version=%{version} -X main.buildstamp=${SOURCE_DATE_EPOCH}" for cmd in grafana-cli grafana-server; do %gobuild -o %{archbindir}/${cmd} ./pkg/cmd/${cmd} done @@ -604,9 +603,10 @@ export GO111MODULE=off %changelog -* Thu Apr 23 2020 Andreas Gerstmayr 6.7.3-1 +* Tue Apr 28 2020 Andreas Gerstmayr 6.7.3-1 - update to 6.7.3 tagged upstream community sources, see CHANGELOG -- set grafana version in Grafana UI and grafana-cli --version +- add scripts to list Go dependencies and bundled npmjs dependencies +- set Grafana version in Grafana UI and grafana-cli --version - declare README.md as documentation of datasource plugins - create grafana.db on first installation (fixes RH BZ #1805472) - change permissions of /var/lib/grafana to 750 diff --git a/sources b/sources index 29b7390..821068d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (grafana-6.7.2.tar.gz) = cd02dd2d637b352d3190c45331752025d756c9e8a8f66ddab390ad853f81335a6d2f7b014481c4e7092d2543f8354c06ff0e37ec21a0a1cd18c9e37813e0cffb -SHA512 (grafana_webpack-6.7.2.tar.gz) = e13f2403491fbc66e5f18a5462f067e768012b7d86a23186a56bdadad8e42f1d48225b555af925ee6ca72f5df73f235d0d8fd8a04d17c7e3f25c7ac014a00fe3 +SHA512 (grafana-6.7.3.tar.gz) = 04c77b80bc8239981364e188c0920a92a70d0988109b3a263b6852cc021d4351e6e731136edc3c3c09a96836545d2ce0df9db5dec4fed0c020e6b8226cc9ec21 +SHA512 (grafana_webpack-6.7.3.tar.gz) = 04f33f2adc0f6fa03f32e7c5522e59ff2543a5488b5d3bec7ee8c62a027e55aa0a772fb1354b19f8e580ebd07a73c7137d2810eca5e54b76d4394c669195978f