From f4f06b1339354352174e0bf0fa2807b5d31c50c9 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 14 Nov 2023 15:04:03 +0100
Subject: [PATCH] Fix sourceware.org/PR31045

- Fix sourceware.org/PR31045
  "Don't try setting translation unit for unique types"
  Apply patch
  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch.
  That patch is applied in upstream mainline and will be available in
  libabigail 2.5.
- Use %autosetup instead of the previous %setup and %patch macros.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 .gitignore      |  1 +
 libabigail.spec | 14 ++++++++++++--
 sources         |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2eb7d06..f1bb633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@
 /libabigail-2.3.tar.xz
 /0001-ir-Remove-redundant-virtual-member-functions.patch
 /libabigail-2.4.tar.xz
+/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
diff --git a/libabigail.spec b/libabigail.spec
index 7a20369..ae10159 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -3,12 +3,13 @@
 
 Name: libabigail
 Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?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
 
 BuildRequires: libbpf-devel
 BuildRequires: binutils-devel
@@ -91,7 +92,7 @@ them manually.
 %endif
 
 %prep
-%setup -n %{tarball_name}
+%autosetup -v -S git
 
 %build
 %configure --enable-ctf --enable-btf --disable-silent-rules --disable-zip-archive --disable-static
@@ -159,6 +160,15 @@ fi
 %endif
 
 %changelog
+* Tue Nov 14 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
+- Fix sourceware.org/PR31045
+  "Don't try setting translation unit for unique types"
+  Apply patch
+  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch.
+  That patch is applied in upstream mainline and will be available in
+  libabigail 2.5.
+- Use %autosetup instead of the previous %setup and %patch macros.
+
 * Fri Oct 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
 - Update to upstream 2.4 tarball
 - Drop patches
diff --git a/sources b/sources
index 38e35b0..159f1dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libabigail-2.4.tar.xz) = f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
+SHA512 (0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch) = f2145d6f9552dcd818228c08a68b6d54f7d79c53d79c2fff18f2664ac3684d2da09670247e482a18ee8f3b44fafbac425ca8d357ea4c621212b84b8180bd989e