From 88895e18b5cfe2def0c89a959af80bad4d5dd327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 12 Jan 2022 16:24:16 +0100 Subject: [PATCH] Fix issues with conflicting multilib packages --- abrt.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 558be8b..51289a2 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -81,6 +81,10 @@ BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete BuildRequires: python3-dbus + +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility +%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib} +BuildRequires: /usr/bin/marshalparser %endif Requires: libreport >= %{libreport_ver} @@ -305,6 +309,7 @@ uncaught exception in python 3 programs. %package -n python3-abrt-container-addon Summary: %{name}'s container addon for catching Python 3 exceptions +BuildArch: noarch Conflicts: python3-abrt-addon Requires: container-exception-logger @@ -323,6 +328,7 @@ of machine_id for abrt events. %package tui Summary: %{name}'s command line interface +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} @@ -1003,6 +1009,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jan 12 2022 Miro Hrončok - 2.14.6-11 +- Make abrt-tui and python3-abrt-container-addon noarch as they contain no architecture-specific content +- Ensure Python bytecode in noarch subpackages is reproducible + * Thu Jan 06 2022 Matěj Grabovský - 2.14.6-10 - Bump release for rebuild