From 7af78833c5388df7cfabeceb9662b92085226948 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 23 Apr 2024 11:54:16 +0200
Subject: [PATCH] Fix https://issues.redhat.com/browse/RHEL-30013

---
 .gitignore           |  1 +
 .libabigail.metadata |  1 +
 libabigail.spec      | 20 +++++++++++++-------
 sources              |  4 +---
 4 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 .libabigail.metadata

diff --git a/.gitignore b/.gitignore
index 31ee227..e1f35ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
 /libabigail-2.4.tar.xz
 /0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
 /0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+/libabigail-2.5.tar.xz
diff --git a/.libabigail.metadata b/.libabigail.metadata
new file mode 100644
index 0000000..8c41a2d
--- /dev/null
+++ b/.libabigail.metadata
@@ -0,0 +1 @@
+121ce659993be416f2695d8fe2d40c26078bd644 libabigail-2.5.tar.xz
diff --git a/libabigail.spec b/libabigail.spec
index e10be61..475b38b 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -2,15 +2,13 @@
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 2.4
-Release: 3%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 Summary: Set of ABI analysis tools
 
 License: Apache-2.0 WITH LLVM-exception
 URL: https://sourceware.org/libabigail/
 Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz
-Patch1: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
-Patch2: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
 
 BuildRequires: git
 BuildRequires: gcc-c++
@@ -19,8 +17,8 @@ BuildRequires: elfutils-devel
 BuildRequires: libbpf-devel
 BuildRequires: libxml2-devel
 BuildRequires: doxygen
-BuildRequires: %{_bindir}/python3
 BuildRequires: python3-sphinx
+BuildRequires: python3-devel
 BuildRequires: texinfo
 
 %description
@@ -111,8 +109,8 @@ fi
 %{_bindir}/abilint
 %{_bindir}/abipkgdiff
 %{_bindir}/kmidiff
-%{_libdir}/libabigail.so.3
-%{_libdir}/libabigail.so.3.0.0
+%{_libdir}/libabigail.so.4
+%{_libdir}/libabigail.so.4.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
 %license LICENSE.txt license-change-2020.txt
@@ -131,6 +129,14 @@ fi
 %doc doc/manuals/html/*
 
 %changelog
+* Tue Apr 23 2024 Dodji Seketeli <dodji@redhat.com> - 2.5-1
+- Update to upstream 2.5 tarball
+- Drop patches (as they are now upstream):
+  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+  0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+- Add BuildRequires: python3-devel
+- Remove BuildRequires: %%{_bindir}/python3
+
 * Fri Nov 17 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
 - Fix SPDX Licensing string
 
diff --git a/sources b/sources
index 32bfac4..d84e053 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (libabigail-2.4.tar.xz) = f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
-SHA512 (0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch) = f2145d6f9552dcd818228c08a68b6d54f7d79c53d79c2fff18f2664ac3684d2da09670247e482a18ee8f3b44fafbac425ca8d357ea4c621212b84b8180bd989e
-SHA512 (0002-suppression-Add-has_strict_flexible_array_data_membe.patch) = 28b8eecba059e2e08e907ecc8ee9e03d57acdc94ce4e1aea4b8c51cf78c7711812215539149e5d24e77fb4c7a6b62c2e5062e7ff87b69d4ee2a85d2205e8b00b
+SHA512 (libabigail-2.5.tar.xz) = 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d