From a66bbd93b5191edd989a5c26483fa47105eb6722 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 8 Oct 2021 11:50:31 +0100 Subject: [PATCH] Add Conflicts for i686/x86_64 devel subpackage (#1915339) Resolves: #1915339 --- gobject-introspection.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 72a063c..69562ad 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -2,7 +2,7 @@ Name: gobject-introspection Version: 1.68.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Introspection system for GObject-based libraries License: GPLv2+ and LGPLv2+ and MIT @@ -50,6 +50,14 @@ Requires: python3-markdown # This package only works with the Python version it was built with # https://bugzilla.redhat.com/show_bug.cgi?id=1691064 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} +%else +%ifarch i686 +Conflicts: gobject-introspection-devel.x86_64 <= %{version}-%{release} +%endif +%endif %description devel Libraries and headers for gobject-introspection @@ -88,6 +96,9 @@ Libraries and headers for gobject-introspection %{_mandir}/man1/g-ir-scanner.1* %changelog +* Fri Oct 08 2021 David King - 1.68.0-9 +- Add Conflicts for i686/x86_64 devel subpackage (#1915339) + * Wed Aug 18 2021 Carlos O'Donell - 1.68.0-8 - Rebuilt for libffi 3.4.2 SONAME transition. Related: rhbz#1891914