diff --git a/0002-add-manpages.patch b/0002-add-manpages.patch index db27b7c..dd30b49 100644 --- a/0002-add-manpages.patch +++ b/0002-add-manpages.patch @@ -10,7 +10,7 @@ index 0000000000..081d35bfae --- /dev/null +++ b/docs/man/man1/grafana-cli.1 @@ -0,0 +1,63 @@ -+.TH GRAFANA "1" "July 2022" "Grafana cli version 9.0.5" "User Commands" ++.TH GRAFANA "1" "September 2022" "Grafana cli version 9.0.8" "User Commands" +.SH NAME +grafana-cli \- command line administration for the Grafana metrics dashboard and graph editor +.SH DESCRIPTION @@ -79,7 +79,7 @@ index 0000000000..a10acbb253 --- /dev/null +++ b/docs/man/man1/grafana-server.1 @@ -0,0 +1,80 @@ -+.TH VERSION "1" "July 2022" "Version 9.0.5" "User Commands" ++.TH VERSION "1" "September 2022" "Version 9.0.8" "User Commands" +.SH NAME +grafana-server \- back-end server for the Grafana metrics dashboard and graph editor +.SH DESCRIPTION @@ -103,7 +103,7 @@ index 0000000000..a10acbb253 +.P +.SH OPTIONS +The -+.B gafana-server ++.B grafana-server +configuration is specified in +.BR /etc/grafana/grafana.ini +and is well documented with comments. diff --git a/README.md b/README.md index d9d003a..cc610eb 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The grafana package * create the patch * declare and apply (`%prep`) the patch in the specfile * if the patch affects Go or Node.js dependencies, or the webpack - * add the patch to `PATCHES_PRE_VENDOR` or `PATCHES_PRE_WEBPACK` in the Makefile + * update the `create_bundles.sh` script and apply the patch * create new tarballs * update the specfile with new tarball name and contents of the `.manifest` file diff --git a/grafana.spec b/grafana.spec index 7af5bc8..3cfbed1 100644 --- a/grafana.spec +++ b/grafana.spec @@ -22,7 +22,7 @@ end} %global gotestflags %{gotestflags} -tags=integration Name: grafana -Version: 9.0.5 +Version: 9.0.8 Release: 1%{?dist} Summary: Metrics dashboard and graph editor License: AGPLv3 @@ -552,7 +552,7 @@ Provides: bundled(npm(memoize-one)) = 4.0.3 Provides: bundled(npm(mini-css-extract-plugin)) = 2.6.0 Provides: bundled(npm(mocha)) = 10.0.0 Provides: bundled(npm(mock-raf)) = 1.0.1 -Provides: bundled(npm(moment)) = 2.29.3 +Provides: bundled(npm(moment)) = 2.29.4 Provides: bundled(npm(moment-timezone)) = 0.5.34 Provides: bundled(npm(monaco-editor)) = 0.31.1 Provides: bundled(npm(monaco-promql)) = 1.7.4 @@ -889,8 +889,15 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio %changelog +* Thu Sep 15 2022 Andreas Gerstmayr 9.0.8-1 +- update to 9.0.8 tagged upstream community sources, see CHANGELOG +- do not list /usr/share/grafana/conf twice +- drop makefile in favor of create_bundles.sh script +- sync provides/obsoletes with CentOS versions +- drop husky patch + * Wed Jul 27 2022 Andreas Gerstmayr 9.0.5-1 -- update to 9.0.5 tagged upstream community sources, see CHANGELOG (rhbz#2107413) +- update to 9.0.5 tagged upstream community sources, see CHANGELOG (rhbz#2107413) - run integration tests in check phase - remove conditional around go-rpm-macros - resolve CVE-2022-31107 grafana: OAuth account takeover (rhbz#2107435) diff --git a/sources b/sources index bfd7930..66988bd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (grafana-9.0.5.tar.gz) = c72d1ce837f0d02faa188dc722f1816c1099b1666642aee658cf2c15a3b8967adbc01e5e9b349da0f7f8503a23af607c4246d7f0e2d9ef2a2e600310fc355870 -SHA512 (grafana-webpack-9.0.5-1.tar.gz) = 424adc5dd1b73fdc5624b312b356a56a2a8f4ca5e8e14344581d5d1a9bc54b9edc8c02b2742d0d1fa3670bf63f2e08f6360569be128bb83d7f5c18041f82f1c5 -SHA512 (grafana-vendor-9.0.5-1.tar.xz) = e79a62366c03366d33544f323bd002905fd83d4bb21c0acac62297c05be34495eec978de22d64c6b9215448e31c2dbd052540b1e88ce3222a1a60bfa066e08e2 +SHA512 (grafana-9.0.8.tar.gz) = faa8497512f31646ad2391f080452b8d2fd7b6077df566f304d3d2aad22ea164d0f06dd03cf9af87be513ee1feea935562cbd264d5e58c0fd3dff3dd960f6afc +SHA512 (grafana-webpack-9.0.8-1.tar.gz) = 9bd7180b80363925ec0a8adf40316923e3f28aa6ce3980d20b82b84515ae72665cb6d6aa7ae878b26e17a64b84d0b19231eedc57d2d2dd78542ac70095335b51 +SHA512 (grafana-vendor-9.0.8-1.tar.xz) = 669f1a470ab011b0dee57438591a1be3d9597af912484862b6dfe7456450132267791034beadb8dc7f96eced7a77db675471f6fb1dd373928fab4317e429102c