From dc24d7a595bcdebd2ea12a3f30a045f14d0f1792 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 16:47:33 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .libdazzle.metadata | 1 - SPECS/libdazzle.spec | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 .libdazzle.metadata diff --git a/.libdazzle.metadata b/.libdazzle.metadata deleted file mode 100644 index c3ce5b8..0000000 --- a/.libdazzle.metadata +++ /dev/null @@ -1 +0,0 @@ -3cc4a29935d7d8bf9218e9cb3eb95042b7cf6f0f SOURCES/libdazzle-3.28.5.tar.xz diff --git a/SPECS/libdazzle.spec b/SPECS/libdazzle.spec index 7e649cf..f3aa6af 100644 --- a/SPECS/libdazzle.spec +++ b/SPECS/libdazzle.spec @@ -2,7 +2,7 @@ Name: libdazzle Version: 3.28.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Experimental new features for GTK+ and GLib License: GPLv3+ @@ -36,6 +36,14 @@ development of this project. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +# https://bugzilla.redhat.com/show_bug.cgi?id=1972097 +%ifarch x86_64 +Conflicts: %{name}-devel(x86-32) <= %{version}-%{release} +%else +%ifarch i686 +Conflicts: %{name}-devel(x86-64) <= %{version}-%{release} +%endif +%endif %description devel The %{name}-devel package contains libraries and header files for @@ -83,6 +91,10 @@ dbus-run-session -- xvfb-run -w 10 ninja test %{__ninja_common_opts} -C %{_vpath %changelog +* Wed May 24 2023 Kalev Lember - 3.28.5-3 +- Add Conflicts for i686/x86_64 devel subpackage +- Resolves: #1972097 + * Mon Feb 01 2021 Kalev Lember - 3.28.5-2 - Rebuild to ship libdazzle-devel in CRB - Resolves: #1919429