#16 Fix issues with conflicting multilib packages
Merged 8 months ago by mgrabovs. Opened 8 months ago by churchyard.
rpms/ churchyard/abrt marshalparser  into  rawhide

file modified
+11 -1
@@ -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-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 @@ 

  

  %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 @@ 

  

  %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 @@ 

  %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh

  

  %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

  - Bump release for rebuild

  

no initial comment

Thank you very much! This is great.

Do you feel like proposing the same patch upstream? (If not, we'll just port it eventually.)

Pull-Request has been merged by mgrabovs

8 months ago

By the way, is it OK to change arch just like this? What I mean is, we don't any any Obsoletes or anything like that, right?

It is OK on rawhide. If you want to backport this to a stable release, you might need to Obsolete previous versions available from the fedora repository.

https://github.com/abrt/abrt/pull/1591 -- but no guarantees it will build on anything else than Fedora

Thank you for the confirmation. We're only doing this because of rpmdeplint complaining and blocking gating, so it's Rawhide-only for now.

Just verified that the new version upgrades the old:

  Upgrading        : abrt-tui-2.14.6-11.fc36.noarch                                                                                                                                                                         7/14 
  Cleanup          : abrt-tui-2.14.6-7.fc35.x86_64 

I recon no obsoletes are needed anywhere. It might have only been needed in the past with yum.

Metadata