From a029c81581d6edb0fa0de658ad68f83caa5fc3aadc0daf1d8ee993e813a408ca Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 8 Oct 2021 10:18:59 +0000 Subject: [PATCH 1/3] Accepting request 922558 from home:witekbedyk:branches:server:monitoring - Add patch 0001-Add-source-code-reference.patch * Add URL to package source code in the login page footer OBS-URL: https://build.opensuse.org/request/show/922558 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=60 --- 0001-Add-source-code-reference.patch | 37 ++++++++++++++++++++++++++++ Makefile | 2 +- grafana-7.5.7.tar.gz | 4 +-- grafana.changes | 6 +++++ vendor.tar.gz | 4 +-- 5 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 0001-Add-source-code-reference.patch diff --git a/0001-Add-source-code-reference.patch b/0001-Add-source-code-reference.patch new file mode 100644 index 0000000..690b581 --- /dev/null +++ b/0001-Add-source-code-reference.patch @@ -0,0 +1,37 @@ +From 4a0ab78a061ac25039f33a3f9b620ef0f8032d3a Mon Sep 17 00:00:00 2001 +From: Witek Bedyk +Date: Thu, 16 Sep 2021 15:43:01 +0200 +Subject: [PATCH] Patch SLE15 source code + +--- + public/app/core/components/Footer/Footer.tsx | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx +index 5b7be702bd..4b4948c30e 100644 +--- a/public/app/core/components/Footer/Footer.tsx ++++ b/public/app/core/components/Footer/Footer.tsx +@@ -45,14 +45,12 @@ export let getVersionLinks = (): FooterLink[] => { + + links.push({ text: `v${buildInfo.version} (${buildInfo.commit})` }); + +- if (buildInfo.hasUpdate) { +- links.push({ +- text: `New version available!`, +- icon: 'download-alt', +- url: 'https://grafana.com/grafana/download?utm_source=grafana_footer', +- target: '_blank', +- }); +- } ++ links.push({ ++ text: `Source code`, ++ icon: 'download-alt', ++ url: 'https://build.opensuse.org/package/show/openSUSE:Factory/grafana', ++ target: '_blank', ++ }); + + return links; + }; +-- +2.26.2 + diff --git a/Makefile b/Makefile index ad02fa9..8bba254 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ tar: tar --format=posix -cf ../$$tar $$basename && \ cd $$basename && \ # Patches for the JS frontend go after here \ - # No patches currently needed \ + patch -p1 -i ../../0001-Add-source-code-reference.patch && \ # End patches section \ yarn install --pure-lockfile && \ yarn run build && \ diff --git a/grafana-7.5.7.tar.gz b/grafana-7.5.7.tar.gz index 721f304..ff7f5d7 100644 --- a/grafana-7.5.7.tar.gz +++ b/grafana-7.5.7.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:225af1afcd4be5e0589d9c982d76ab2cccc28f2c41934804e74f475aad957049 -size 32740935 +oid sha256:73153332d00ac9a5b63395c81e6a1532ace94904cc4840ab75f42b4cdfaa2ad1 +size 32555914 diff --git a/grafana.changes b/grafana.changes index 0837d2a..2999ad3 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 21 07:27:09 UTC 2021 - Witek Bedyk + +- Add patch 0001-Add-source-code-reference.patch + * Add URL to package source code in the login page footer + ------------------------------------------------------------------- Thu May 20 02:14:06 UTC 2021 - daniel.molkentin@suse.com diff --git a/vendor.tar.gz b/vendor.tar.gz index 32e065e..072c201 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0325c2b8c392647e166d3579595673889342cdfcdaa4050901fecb7aa7dfc07 -size 12121040 +oid sha256:407b835c1df3cdd675ee0422bd53fa09ca7ef17330f114ed6bc7fc1e849fbe9a +size 11947755 From 507d1d28da5b65ad4faead63e3f90d667a3c5963c535de2161f9b81f9163b69b Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 22 Oct 2021 10:57:36 +0000 Subject: [PATCH 2/3] Accepting request 926875 from home:witekbedyk:branches:server:monitoring Autobuild scripts prevent block patches not mentioned in the spec file. Trying to workaround this here. OBS-URL: https://build.opensuse.org/request/show/926875 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=61 --- Makefile | 2 +- ...d-source-code-reference.patch => add-source-code-reference | 0 grafana.changes | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename 0001-Add-source-code-reference.patch => add-source-code-reference (100%) diff --git a/Makefile b/Makefile index 8bba254..1f393f7 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ tar: tar --format=posix -cf ../$$tar $$basename && \ cd $$basename && \ # Patches for the JS frontend go after here \ - patch -p1 -i ../../0001-Add-source-code-reference.patch && \ + patch -p1 -i ../../add-source-code-reference && \ # End patches section \ yarn install --pure-lockfile && \ yarn run build && \ diff --git a/0001-Add-source-code-reference.patch b/add-source-code-reference similarity index 100% rename from 0001-Add-source-code-reference.patch rename to add-source-code-reference diff --git a/grafana.changes b/grafana.changes index 2999ad3..75516c7 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Sep 21 07:27:09 UTC 2021 - Witek Bedyk +Fri Oct 8 12:28:15 UTC 2021 - Witek Bedyk -- Add patch 0001-Add-source-code-reference.patch +- Add patch add-source-code-reference * Add URL to package source code in the login page footer ------------------------------------------------------------------- From ec23dd53c416252e67cc15d6daa27ec6a1debc18d54adc2949d177adde8acf96 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 22 Oct 2021 14:27:20 +0000 Subject: [PATCH 3/3] Accepting request 926954 from home:witekbedyk:branches:server:monitoring Revert patch file rename. Add patch as source to spec file. OBS-URL: https://build.opensuse.org/request/show/926954 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=62 --- ...rce-code-reference => 0001-Add-source-code-reference.patch | 0 Makefile | 2 +- grafana.changes | 4 ++-- grafana.spec | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename add-source-code-reference => 0001-Add-source-code-reference.patch (100%) diff --git a/add-source-code-reference b/0001-Add-source-code-reference.patch similarity index 100% rename from add-source-code-reference rename to 0001-Add-source-code-reference.patch diff --git a/Makefile b/Makefile index 1f393f7..8bba254 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ tar: tar --format=posix -cf ../$$tar $$basename && \ cd $$basename && \ # Patches for the JS frontend go after here \ - patch -p1 -i ../../add-source-code-reference && \ + patch -p1 -i ../../0001-Add-source-code-reference.patch && \ # End patches section \ yarn install --pure-lockfile && \ yarn run build && \ diff --git a/grafana.changes b/grafana.changes index 75516c7..2999ad3 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Oct 8 12:28:15 UTC 2021 - Witek Bedyk +Tue Sep 21 07:27:09 UTC 2021 - Witek Bedyk -- Add patch add-source-code-reference +- Add patch 0001-Add-source-code-reference.patch * Add URL to package source code in the login page footer ------------------------------------------------------------------- diff --git a/grafana.spec b/grafana.spec index 914d69a..8a462ba 100644 --- a/grafana.spec +++ b/grafana.spec @@ -35,6 +35,7 @@ Source2: %{name}-rpmlintrc Source3: README # Makefile to automate build process Source4: Makefile +Source5: 0001-Add-source-code-reference.patch Patch1: drop-grafana-aws-sdk-0.3.0-module.patch BuildRequires: fdupes BuildRequires: git-core