From de4b94d2a0a87dfda81a100bba94d7c42364831d171caf9513919c787cd2658f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rostecki?= Date: Tue, 22 Mar 2022 16:26:21 +0000 Subject: [PATCH] Accepting request 962711 from home:witekbedyk:branches:security:netfilter - Provide dummy firewalld-prometheus-config package (bsc#1197042) This is to prevent file conflicts between Firewalld and Prometheus packages in case Prometheus package is built on a different system than the target one (as it is the case for SUSE Manager). OBS-URL: https://build.opensuse.org/request/show/962711 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=122 --- firewalld.changes | 5 +++++ firewalld.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/firewalld.changes b/firewalld.changes index 5b16305..5ecc5f9 100644 --- a/firewalld.changes +++ b/firewalld.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 18 12:43:17 UTC 2022 - Witek Bedyk + +- Provide dummy firewalld-prometheus-config package (bsc#1197042) + ------------------------------------------------------------------- Mon Mar 7 16:45:58 UTC 2022 - Martin Wilck diff --git a/firewalld.spec b/firewalld.spec index 772389f..5864d65 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -55,6 +55,8 @@ BuildRequires: libxslt-tools BuildRequires: python3-devel BuildRequires: systemd-rpm-macros Recommends: logrotate +Obsoletes: firewalld-prometheus-config < 0.2 +Provides: firewalld-prometheus-config = 0.2 # Workaround: nftables seems to be a python3-nftables requirement, # not of firewalld. Requires: nftables