From a6d2f7a706a937abff18dc788a6bac8f31da5989 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 14 Oct 2021 15:26:59 +0100 Subject: [PATCH] Change Conflicts syntax (#1915339) Resolves: #1915339 --- gobject-introspection.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 69562ad..27dc8da 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -2,7 +2,7 @@ Name: gobject-introspection Version: 1.68.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Introspection system for GObject-based libraries License: GPLv2+ and LGPLv2+ and MIT @@ -52,10 +52,10 @@ Requires: python3-markdown Requires: (python(abi) = %{python3_version} if python3) # https://bugzilla.redhat.com/show_bug.cgi?id=1915339 %ifarch x86_64 -Conflicts: gobject-introspection-devel.i686 <= %{version}-%{release} +Conflicts: gobject-introspection-devel(x86-32) <= %{version}-%{release} %else %ifarch i686 -Conflicts: gobject-introspection-devel.x86_64 <= %{version}-%{release} +Conflicts: gobject-introspection-devel(x86-64) <= %{version}-%{release} %endif %endif @@ -96,6 +96,9 @@ Libraries and headers for gobject-introspection %{_mandir}/man1/g-ir-scanner.1* %changelog +* Thu Oct 14 2021 David King - 1.68.0-10 +- Change Conflicts syntax (#1915339) + * Fri Oct 08 2021 David King - 1.68.0-9 - Add Conflicts for i686/x86_64 devel subpackage (#1915339)