From ff73caace9f6bf6009cc3e33206fa5d16af462c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 6 Jan 2022 15:39:44 +0100 Subject: [PATCH] Do not install conflicting abrt packages in test --- libreport.spec | 5 ++++- tests/smoke.fmf | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libreport.spec b/libreport.spec index bc5d681..266cf96 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.15.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -652,6 +652,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jan 06 2022 Matěj Grabovský - 2.15.2-8 +- Bump release for rebuild + * Wed Dec 22 2021 Matěj Grabovský - 2.15.2-7 - Rebuild for satyr 0.39 diff --git a/tests/smoke.fmf b/tests/smoke.fmf index c043228..1dc5b73 100644 --- a/tests/smoke.fmf +++ b/tests/smoke.fmf @@ -1,5 +1,11 @@ summary: Basic smoke test for libreport require: gcc +prepare: + how: install + # Do not attempt to install conflicting subpackages. + exclude: + - abrt-atomic + - python3-abrt-container-addon execute: script: | test/smoke.sh