diff --git a/0008-Revert-rpm-add-detection-for-armv7hcnl.patch b/0008-Revert-rpm-add-detection-for-armv7hcnl.patch new file mode 100644 index 0000000..627a3e6 --- /dev/null +++ b/0008-Revert-rpm-add-detection-for-armv7hcnl.patch @@ -0,0 +1,26 @@ +From 9eab5a74b5b67f47ade3f0621e0b86b5203022db Mon Sep 17 00:00:00 2001 +From: Pavla Kratochvilova +Date: Mon, 22 Jul 2019 09:04:20 +0200 +Subject: [PATCH] Revert "[rpm] add detection for armv7hcnl" + +--- + dnf/rpm/__init__.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py +index 045a065..85e64cb 100644 +--- a/dnf/rpm/__init__.py ++++ b/dnf/rpm/__init__.py +@@ -90,8 +90,7 @@ _BASEARCH_MAP = _invert({ + 'alpha': ('alpha', 'alphaev4', 'alphaev45', 'alphaev5', 'alphaev56', + 'alphaev6', 'alphaev67', 'alphaev68', 'alphaev7', 'alphapca56'), + 'arm': ('armv5tejl', 'armv5tel', 'armv5tl', 'armv6l', 'armv7l', 'armv8l'), +- 'armhfp': ('armv6hl', 'armv7hl', 'armv7hnl', 'armv7hcnl', 'armv8hl', +- 'armv8hnl', 'armv8hcnl'), ++ 'armhfp': ('armv6hl', 'armv7hl', 'armv7hnl', 'armv8hl', 'armv8hnl', 'armv8hcnl'), + 'i386': ('i386', 'athlon', 'geode', 'i386', 'i486', 'i586', 'i686'), + 'ia64': ('ia64',), + 'mips': ('mips',), +-- +libgit2 0.27.8 + diff --git a/dnf.spec b/dnf.spec index c759b3a..2ec59c0 100644 --- a/dnf.spec +++ b/dnf.spec @@ -80,7 +80,7 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ and GPLv2 and GPL @@ -95,6 +95,8 @@ Patch0006: 0006-Add-detailed-debug-login-for-swdbrpm-transaction.patch # Temporary patch to not fail on modular RPMs without modular metadata # until the infrastructure is ready Patch0007: 0007-Revert-consequences-of-Fail-Safe-mechanism.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1691430 +Patch0008: 0008-Revert-rpm-add-detection-for-armv7hcnl.patch BuildArch: noarch BuildRequires: cmake @@ -512,6 +514,9 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %endif %changelog +* Mon Jul 22 2019 Pavla Kratochvilova - 4.2.7-2 +- Revert patch: [rpm] add detection for armv7hcnl + * Thu Jul 04 2019 Pavla Kratochvilova - 4.2.7-1 - Update to 4.2.7 - librepo: Turn on debug logging only if debuglevel is greater than 2