Hello community, here is the log from the commit of package grafana for openSUSE:Factory checked in at 2020-03-19 19:51:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grafana (Old) and /work/SRC/openSUSE:Factory/.grafana.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grafana" Thu Mar 19 19:51:05 2020 rev:6 rq:786361 version:6.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/grafana/grafana.changes 2019-12-05 17:39:38.685346049 +0100 +++ /work/SRC/openSUSE:Factory/.grafana.new.3160/grafana.changes 2020-03-19 19:54:16.984277644 +0100 @@ -1,0 +2,63 @@ +Fri Mar 06 06:20:34 UTC 2020 - [email protected] + +- Update to version 6.6.2: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Fri Mar 06 06:15:10 UTC 2020 - [email protected] + +- Update to version 6.6.1: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 21:21:34 UTC 2020 - [email protected] + +- Update to version 6.6.0: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 21:08:39 UTC 2020 - [email protected] + +- Update to version 6.5.3: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:59:13 UTC 2020 - [email protected] + +- Update to version 6.5.2: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:54:08 UTC 2020 - [email protected] + +- Update to version 6.5.1: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:38:10 UTC 2020 - [email protected] + +- Update to version 6.5.0 + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:29:16 UTC 2020 - [email protected] + +- Update to version 6.4.5: + * Create version 6.4.5 + * CloudWatch: Fix high CPU load (#20579) + +------------------------------------------------------------------- +Thu Mar 05 20:22:10 UTC 2020 - [email protected] + +- add obs-service-go_modules to download required modules into vendor.tar.gz +- adjusted spec file to use vendor.tar.gz +- adjusted Makefile to work with new filenames +- BuildRequire go1.14 +- Update to version 6.4.4: + * DataLinks: Fix blur issues. #19883, @aocenas + * Docker: Makes it possible to parse timezones in the docker image. #20081, @xlson + * LDAP: All LDAP servers should be tried even if one of them returns a connection error. #20077, @jongyllen + * LDAP: No longer shows incorrectly matching groups based on role in debug page. #20018, @xlson + * Singlestat: Fix no data / null value mapping . #19951, @ryantxu + +------------------------------------------------------------------- Old: ---- grafana-6.4.3.tar.xz New: ---- grafana-6.6.2.tar.gz vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grafana.spec ++++++ --- /var/tmp/diff_new_pack.BdUgZ8/_old 2020-03-19 19:54:18.348277692 +0100 +++ /var/tmp/diff_new_pack.BdUgZ8/_new 2020-03-19 19:54:18.348277692 +0100 @@ -1,7 +1,7 @@ # # spec file for package grafana # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,23 +26,24 @@ %endif Name: grafana -Version: 6.4.3 +Version: 6.6.2 Release: 0 Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB License: Apache-2.0 Group: System/Monitoring URL: http://grafana.org/ -Source: %{name}-%{version}.tar.xz -Source1: %{name}-rpmlintrc +Source: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: %{name}-rpmlintrc # Instructions on the build process -Source2: README +Source3: README # Makefile to automate build process -Source3: Makefile +Source4: Makefile BuildRequires: fdupes -BuildRequires: go >= 1.11 +BuildRequires: git-core BuildRequires: golang-packaging BuildRequires: shadow -Requires(post): %insserv_prereq +BuildRequires: ( go >= 1.14 with go < 1.15 ) BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -54,6 +55,7 @@ %prep %setup -q -n grafana-%{version} +%setup -q -T -D -a 1 -n grafana-%{version} %build %goprep github.com/grafana/grafana @@ -64,7 +66,7 @@ # (The %%gobuild macro can't take quoted strings; they get split up when # expanded to $extra_flags in process_build() in /usr/lib/rpm/golang.sh.) export IMPORTPATH="github.com/grafana/grafana" -export BUILDFLAGS="-v -p 4 -x -buildmode=pie" +export BUILDFLAGS="-v -p 4 -x -buildmode=pie -mod=vendor" export GOPATH=%{_builddir}/go:%{_builddir}/contrib export GOBIN=%{_builddir}/go/bin go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd/... ++++++ Makefile ++++++ --- /var/tmp/diff_new_pack.BdUgZ8/_old 2020-03-19 19:54:18.368277693 +0100 +++ /var/tmp/diff_new_pack.BdUgZ8/_new 2020-03-19 19:54:18.368277693 +0100 @@ -8,7 +8,7 @@ @which grunt >/dev/null 2>&1 || ( echo "grunt not found; run \`sudo npm install -g grunt-cli\`" && false ) clean: - rm -f $(NAME)-*.tar $(NAME)-*.tar.xz + rm -f $(NAME)-*.tar $(NAME)-*.tar.gz tar: osc service disabledrun @@ -18,6 +18,7 @@ tar=$$basename.tar && \ tmpdir=$$(mktemp -d -p .) && \ cd $$tmpdir && \ + gunzip ../$$tar.gz && \ tar -xf ../$$tar && \ cd $$basename && \ # exclude the phantomjs-prebuilt binary module from the webpack \ @@ -32,8 +33,6 @@ cd .. && \ echo "Updating $$basename/tools $$basename/public in tarball..." && \ tar -rf ../$$tar $$basename/tools $$basename/public && \ - # remove go.mod and go.sum as we build exclusively using vendor deps \ - tar -f ../$$tar --delete $$basename/go.mod $$basename/go.sum && \ cd .. && \ - xz $$tar && \ + gzip $$tar && \ rm -rf $$tmpdir ++++++ README ++++++ --- /var/tmp/diff_new_pack.BdUgZ8/_old 2020-03-19 19:54:18.392277694 +0100 +++ /var/tmp/diff_new_pack.BdUgZ8/_new 2020-03-19 19:54:18.392277694 +0100 @@ -17,7 +17,9 @@ In order for this to work you need to have npm >= 6, < 12, yarn and grunt installed. To get set up, run: - # zypper in npm10 + # zypper in npm12 + # zypper in obs-service-download_files obs-service-go_modules \ + obs-service-obs_scm # npm install -g yarn # npm install -g grunt-cli ++++++ _service ++++++ --- /var/tmp/diff_new_pack.BdUgZ8/_old 2020-03-19 19:54:18.444277696 +0100 +++ /var/tmp/diff_new_pack.BdUgZ8/_new 2020-03-19 19:54:18.448277696 +0100 @@ -3,11 +3,18 @@ <param name="url">https://github.com/grafana/grafana</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">6.4.3</param> - <param name="revision">v6.4.3</param> + <param name="versionformat">6.6.2</param> + <param name="revision">v6.6.2</param> <param name="changesgenerate">enable</param> </service> + <service name="recompress" mode="disabled"> + <param name="compression">gz</param> + <param name="file">grafana*.tar</param> + </service> <service name="set_version" mode="disabled"> <param name="basename">grafana</param> </service> + <service name="go_modules" mode="disabled"> + <param name="archive">grafana-6.6.2.tar.gz</param> + </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.BdUgZ8/_old 2020-03-19 19:54:18.540277699 +0100 +++ /var/tmp/diff_new_pack.BdUgZ8/_new 2020-03-19 19:54:18.544277699 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/grafana/grafana</param> - <param name="changesrevision">3a2bfb7e3809a193125f0dbb8109e95cbf52db3e</param> + <param name="changesrevision">3fa63cfc34668781c7f9b3caafe6d9d400b06b7f</param> </service> </servicedata> \ No newline at end of file
