From 139cd30fad97553985cea9d6db5e5fbee322b06c Mon Sep 17 00:00:00 2001 From: Mark Goodwin Date: Mon, 17 Jun 2019 12:15:30 +1000 Subject: [PATCH] obsolete packages from -2 build that are no longer shipped Resolves: bz1685316 --- grafana.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index dcbc8f1..485e159 100644 --- a/grafana.spec +++ b/grafana.spec @@ -30,7 +30,7 @@ end} Name: grafana Version: 6.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -63,6 +63,18 @@ ExclusiveArch: %{grafana_arches} %{?systemd_requires} Requires(pre): shadow-utils +# temporary obsolete for packages we're not shipping +%if 0%{?rhel} != 0 +Obsoletes: grafana-azure-monitor +Obsoletes: grafana-cloudwatch +Obsoletes: grafana-graphite +Obsoletes: grafana-influxdb +Obsoletes: grafana-loki +Obsoletes: grafana-mssql +Obsoletes: grafana-opentsdb +Obsoletes: grafana-stackdriver +%endif + BuildRequires: systemd, golang, go-srpm-macros %if !0%{?disable_subpkg_cloudwatch} @@ -690,6 +702,9 @@ go test ./pkg/... %changelog +* Mon Jun 17 2019 Mark Goodwin 6.2.2-4 +- obsolete packages from -2 build that are no longer shipped + * Mon Jun 17 2019 Mark Goodwin 6.2.2-3 - disable some subpackages on some platforms