Fix issues with conflicting multilib packages
This commit is contained in:
parent
1c9f6e51cf
commit
88895e18b5
12
abrt.spec
12
abrt.spec
@ -49,7 +49,7 @@
|
|||||||
Summary: Automatic bug detection and reporting tool
|
Summary: Automatic bug detection and reporting tool
|
||||||
Name: abrt
|
Name: abrt
|
||||||
Version: 2.14.6
|
Version: 2.14.6
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://abrt.readthedocs.org/
|
URL: https://abrt.readthedocs.org/
|
||||||
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
@ -81,6 +81,10 @@ BuildRequires: python3-devel
|
|||||||
BuildRequires: python3-systemd
|
BuildRequires: python3-systemd
|
||||||
BuildRequires: python3-argcomplete
|
BuildRequires: python3-argcomplete
|
||||||
BuildRequires: python3-dbus
|
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
|
%endif
|
||||||
|
|
||||||
Requires: libreport >= %{libreport_ver}
|
Requires: libreport >= %{libreport_ver}
|
||||||
@ -305,6 +309,7 @@ uncaught exception in python 3 programs.
|
|||||||
|
|
||||||
%package -n python3-abrt-container-addon
|
%package -n python3-abrt-container-addon
|
||||||
Summary: %{name}'s container addon for catching Python 3 exceptions
|
Summary: %{name}'s container addon for catching Python 3 exceptions
|
||||||
|
BuildArch: noarch
|
||||||
Conflicts: python3-abrt-addon
|
Conflicts: python3-abrt-addon
|
||||||
Requires: container-exception-logger
|
Requires: container-exception-logger
|
||||||
|
|
||||||
@ -323,6 +328,7 @@ of machine_id for abrt events.
|
|||||||
|
|
||||||
%package tui
|
%package tui
|
||||||
Summary: %{name}'s command line interface
|
Summary: %{name}'s command line interface
|
||||||
|
BuildArch: noarch
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: libreport-cli >= %{libreport_ver}
|
Requires: libreport-cli >= %{libreport_ver}
|
||||||
Requires: abrt-libs = %{version}-%{release}
|
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
|
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 12 2022 Miro Hrončok <mhroncok@redhat.com> - 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ý <mgrabovs@redhat.com> - 2.14.6-10
|
* Thu Jan 06 2022 Matěj Grabovský <mgrabovs@redhat.com> - 2.14.6-10
|
||||||
- Bump release for rebuild
|
- Bump release for rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user