From 54abedd06a09d4cb022505624ea0a1c679d2a8ed Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Mar 08 2023 11:51:46 +0000 Subject: Conflict with ansible-macros We have and old ansible-macros packages in RDO which provided macros before ansible-packaging existed. This patch is conflicting to it. Related-to: https://review.rdoproject.org/r/q/Ia335966d17c4716b557a4899bd31132c4f757897 --- diff --git a/SPECS/ansible-packaging.spec b/SPECS/ansible-packaging.spec index 3b8cd3f..616da1e 100644 --- a/SPECS/ansible-packaging.spec +++ b/SPECS/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 9.1%{?dist} +Release: 9.1.1%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPL-3.0-or-later @@ -26,6 +26,7 @@ Requires: ansible-srpm-macros = %{version}-%{release} %if ! (0%{?rhel} >= 8) Conflicts: ansible-core < 2.12.1-3 %endif +Conflicts: ansible-macros Conflicts: ansible < 2.9.27-3 BuildArch: noarch @@ -149,6 +150,9 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog +* Wed Mar 08 2023 Alfredo Moralejo - 1.9.1.1 +- Conflicts with ansible-macros for RDO + * Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild