From c8f22932a6d04ed3f6e2af8f99522c5c64d0beff7e93619c68ec8295f303b344 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Mon, 11 Feb 2019 11:32:54 +0000 Subject: [PATCH] Accepting request 673305 from home:jfajerski:branches:server:monitoring Note pr-3174.patch removal in changes file to make Factory bot happy. OBS-URL: https://build.opensuse.org/request/show/673305 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=8 --- ...just-default-settings.patch => 0002-Default-settings.patch | 0 golang-github-prometheus-prometheus.changes | 1 + golang-github-prometheus-prometheus.spec | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename 0002-Adjust-default-settings.patch => 0002-Default-settings.patch (100%) diff --git a/0002-Adjust-default-settings.patch b/0002-Default-settings.patch similarity index 100% rename from 0002-Adjust-default-settings.patch rename to 0002-Default-settings.patch diff --git a/golang-github-prometheus-prometheus.changes b/golang-github-prometheus-prometheus.changes index 54ef534..b682b1b 100644 --- a/golang-github-prometheus-prometheus.changes +++ b/golang-github-prometheus-prometheus.changes @@ -228,6 +228,7 @@ Fri Feb 8 07:24:59 UTC 2019 - Jan Fajerski * Fix PromQL printing of empty without(). * Don't reset FiredAt for inactive alerts. * Fix erroneous file version changes and repair existing data. +- remove pr-3174.patch, has been fixed in https://github.com/prometheus/prometheus/pull/3517 ------------------------------------------------------------------- Wed Mar 14 07:20:23 UTC 2018 - jan.fajerski@suse.com diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index f4326e9..7745cfc 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -28,10 +28,10 @@ Group: System/Management Url: https://prometheus.io/ Source: prometheus-%{version}.tar.xz Source1: prometheus.service -Source2: prometheus.yml +Source2: prometheus.yml Patch1: 0001-Do-not-force-the-pure-Go-name-resolver.patch # Lifted from Debian's prometheus package -Patch2: 0002-Adjust-default-settings.patch +Patch2: 0002-Default-settings.patch %ifarch aarch64 # For some reason the aarch64 build fails with: # + promu build