From ebcb800094ebc0332a68b2bc2feb095b3db47104 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 04:07:28 +0100
Subject: [PATCH] update to 0.43.1 [release 0.43.1-1mamba;Thu Jan 16 2020]

---
 ...ibdnf-0.43.1-arm-detect-arch-using-uname.patch | 15 ++++++++-------
 libdnf.spec                                       |  7 +++++--
 2 files changed, 13 insertions(+), 9 deletions(-)
 rename libdnf-0.31.0-arm-detect-arch-using-uname.patch => libdnf-0.43.1-arm-detect-arch-using-uname.patch (56%)

diff --git a/libdnf-0.31.0-arm-detect-arch-using-uname.patch b/libdnf-0.43.1-arm-detect-arch-using-uname.patch
similarity index 56%
rename from libdnf-0.31.0-arm-detect-arch-using-uname.patch
rename to libdnf-0.43.1-arm-detect-arch-using-uname.patch
index 8eac73a..949b4f3 100644
--- a/libdnf-0.31.0-arm-detect-arch-using-uname.patch
+++ b/libdnf-0.43.1-arm-detect-arch-using-uname.patch
@@ -1,22 +1,23 @@
---- libdnf-0.31.0/libdnf/hy-util.cpp.orig	2019-07-13 13:40:25.132045332 +0200
-+++ libdnf-0.31.0/libdnf/hy-util.cpp	2019-07-13 13:41:53.216392596 +0200
-@@ -108,23 +108,6 @@
+diff -ru libdnf-0.43.1.orig/libdnf/hy-util.cpp libdnf-0.43.1/libdnf/hy-util.cpp
+--- libdnf-0.43.1.orig/libdnf/hy-util.cpp	2020-01-16 18:18:43.000000000 +0100
++++ libdnf-0.43.1/libdnf/hy-util.cpp	2020-01-16 18:21:06.663000000 +0100
+@@ -101,23 +101,6 @@
      if (uname(&un) < 0)
          return DNF_ERROR_FAILED;
  
 -    if (!strncmp(un.machine, "armv", 4)) {
 -        /* un.machine is armvXE, where X is version number and E is
 -         * endianness (b or l); we need to add modifiers such as
--         * h (hardfloat), n (neon), c (crypto extensions) */
+-         * h (hardfloat), n (neon). Neon is a requirement of armv8 so
+-         * as far as rpm is concerned armv8l is the equivilent of armv7hnl
+-         * (or 7hnb) so we don't explicitly add 'n' for 8+ as it's expected. */
 -        char endian = un.machine[strlen(un.machine)-1];
 -        char *modifier = un.machine + 5;
 -        while(isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */
 -            modifier++;
 -        if (getauxval(AT_HWCAP) & HWCAP_ARM_VFP)
 -            *modifier++ = 'h';
--        if (getauxval(AT_HWCAP2) & HWCAP2_AES)
--            *modifier++ = 'c';
--        if (getauxval(AT_HWCAP) & HWCAP_ARM_NEON)
+-        if ((atoi(un.machine+4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON))
 -            *modifier++ = 'n';
 -        *modifier++ = endian;
 -        *modifier = 0;
diff --git a/libdnf.spec b/libdnf.spec
index 7742122..9ff2f74 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -1,5 +1,5 @@
 Name:          libdnf
-Version:       0.33.0
+Version:       0.43.1
 Release:       1mamba
 Summary:       Software management library
 Group:         System/Libraries
@@ -15,7 +15,7 @@ Patch2:        libdnf-0.22.0-rpm5-2.patch
 Patch3:        libdnf-0.22.0-rpm5-additional.patch
 Patch4:        libdnf-0.31.0-x86_64-disable_inferior_arch_check.patch
 Patch5:        libdnf-0.31.0-openmamba-kernel-packages.patch
-Patch6:        libdnf-0.31.0-arm-detect-arch-using-uname.patch
+Patch6:        libdnf-0.43.1-arm-detect-arch-using-uname.patch
 Patch7:        libdnf-0.31.0-i586-default-basearch.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
@@ -114,6 +114,9 @@ This package contains libraries and header files for developing applications tha
 %doc README.md
 
 %changelog
+* Thu Jan 16 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.43.1-1mamba
+- update to 0.43.1
+
 * Fri Oct 25 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.33.0-1mamba
 - update to 0.33.0