From 19ad1a32099b07475d321fe5274ff7981bfa7da913ff6e711bda85cb68b7e69e Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Thu, 19 Mar 2020 08:58:44 +0000 Subject: [PATCH] Accepting request 786027 from home:ojkastl_buildservice:Branch_grafana update to 6.6.2; use go_modules service to provide dependencies in vendor.tar.gz; BuildRequires go1.14 to build successfully; adjust Makefile and README to current requirements for 6.6.2 (npm12, not npm10);adjust Makefile to fully work with new file names OBS-URL: https://build.opensuse.org/request/show/786027 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=30 --- Makefile | 7 +++-- README | 4 ++- _service | 11 ++++++-- _servicedata | 2 +- grafana-6.4.3.tar.xz | 3 --- grafana-6.6.2.tar.gz | 3 +++ grafana.changes | 63 ++++++++++++++++++++++++++++++++++++++++++++ grafana.spec | 20 +++++++------- vendor.tar.gz | 3 +++ 9 files changed, 96 insertions(+), 20 deletions(-) delete mode 100644 grafana-6.4.3.tar.xz create mode 100644 grafana-6.6.2.tar.gz create mode 100644 vendor.tar.gz diff --git a/Makefile b/Makefile index 892a380..6cb6999 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ verify-deps: @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: 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 @@ tar: 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 diff --git a/README b/README index cb599c7..a69787b 100644 --- a/README +++ b/README @@ -17,7 +17,9 @@ we have a Makefile which does the following: 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 diff --git a/_service b/_service index 7d1325c..168b0a9 100644 --- a/_service +++ b/_service @@ -3,11 +3,18 @@ https://github.com/grafana/grafana git .git - 6.4.3 - v6.4.3 + 6.6.2 + v6.6.2 enable + + gz + grafana*.tar + grafana + + grafana-6.6.2.tar.gz + diff --git a/_servicedata b/_servicedata index 1f8d7da..35f07a1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 3a2bfb7e3809a193125f0dbb8109e95cbf52db3e + 3fa63cfc34668781c7f9b3caafe6d9d400b06b7f \ No newline at end of file diff --git a/grafana-6.4.3.tar.xz b/grafana-6.4.3.tar.xz deleted file mode 100644 index 8879f1a..0000000 --- a/grafana-6.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb6e8bf9f1080022dc169fa29afbb5876acbc5adba2c4420a8dbf1ef9a2aa4c -size 18172892 diff --git a/grafana-6.6.2.tar.gz b/grafana-6.6.2.tar.gz new file mode 100644 index 0000000..a04540c --- /dev/null +++ b/grafana-6.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52fd5e8bf90b887cf0f151aca1ffebb723fd93e50c023148ee62d765b3cb4a80 +size 28172363 diff --git a/grafana.changes b/grafana.changes index ac43636..4574a21 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Fri Mar 06 06:20:34 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.6.2: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Fri Mar 06 06:15:10 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.6.1: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 21:21:34 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.6.0: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 21:08:39 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.5.3: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:59:13 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.5.2: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:54:08 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.5.1: + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:38:10 UTC 2020 - kastl@b1-systems.de + +- Update to version 6.5.0 + (see installed changelog for the full list of changes) + +------------------------------------------------------------------- +Thu Mar 05 20:29:16 UTC 2020 - kastl@b1-systems.de + +- 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 - kastl@b1-systems.de + +- 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 + ------------------------------------------------------------------- Tue Dec 03 15:09:41 UTC 2019 - witold.bedyk@suse.com diff --git a/grafana.spec b/grafana.spec index 4cfca95..18d6ca2 100644 --- a/grafana.spec +++ b/grafana.spec @@ -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 @@ dashboards and data with teams. %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 @@ dashboards and data with teams. # (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/... diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..b39e6cd --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbd468bb4eeb2f73a24fe7e4b8ad616bb0fa7adcc5c1ebe237069350519a554c +size 8411258