0.14-5 - Add dwz-0.14-binutils-readelf-alt.patch

dwz-0.14-binutils-readelf-alt.patch

@@ -0,0 +1,16 @@
+diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh
+old mode 100644
+new mode 100755
+index 159cbc3..5961abf
+--- a/testsuite/dwz.tests/odr-struct-multifile.sh
++++ b/testsuite/dwz.tests/odr-struct-multifile.sh
+@@ -44,6 +44,9 @@ for name in member_one member_two member_three member_four; do
+     [ $cnt -eq 1 ]
+ done
+ 
++# Even with -wN readelf 2.38-15.fc37 follows and prints the contents
++# of the alt file. So make sure it cannot do that by removing it.
++rm 3
+ 
+ for name in aaa bbb ccc; do
+     cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true)

dwz.spec

@@ -1,14 +1,15 @@
 Summary: DWARF optimization and duplicate removal tool
 Name: dwz
 Version: 0.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GPLv3+
 Source: %{name}-0.14.tar.xz
 BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu
-BuildRequires: make
+BuildRequires: make elfutils
 
 # Patches
 Patch1: dwz-0.14-binutils-Wn.patch
+Patch2: dwz-0.14-binutils-readelf-alt.patch
 
 %description
 The dwz package contains a program that attempts to optimize DWARF
@@ -39,7 +40,11 @@ make check
 %{_mandir}/man1/dwz.1*
 
 %changelog
-* Sat Jun 26 2021 Mark Wielaard <mjw@fedoraproject.org> 0.14-4
+* Wed Jun 29 2022 Mark Wielaard <mjw@fedoraproject.org> 0.14-5
+- Add dwz-0.14-binutils-readelf-alt.patch
+- BuildRequires elfutils (for tests)
+
+* Sun Jun 26 2022 Mark Wielaard <mjw@fedoraproject.org> 0.14-4
 - Add dwz-0.14-binutils-Wn.patch
 
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14-3