diff --git a/0001-Support-for-new-elfutils-Fedora-30.patch b/0001-Support-for-new-elfutils-Fedora-30.patch new file mode 100644 index 0000000..6a20279 --- /dev/null +++ b/0001-Support-for-new-elfutils-Fedora-30.patch @@ -0,0 +1,50 @@ +From 3d6dbb6d48d10579984fb7fda2e79d3d73e10f70 Mon Sep 17 00:00:00 2001 +From: Andrey Ponomarenko +Date: Wed, 3 Jul 2019 16:51:32 +0300 +Subject: [PATCH] Support for new elfutils (Fedora 30) + +--- + abi-dumper.pl | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/abi-dumper.pl ++++ b/abi-dumper.pl +@@ -3,7 +3,7 @@ + # ABI Dumper 1.1 + # Dump ABI of an ELF object containing DWARF debug info + # +-# Copyright (C) 2013-2017 Andrey Ponomarenko's ABI Laboratory ++# Copyright (C) 2013-2019 Andrey Ponomarenko's ABI Laboratory + # + # Written by Andrey Ponomarenko + # +@@ -92,7 +92,7 @@ my %ERROR_CODE = ( + + my $ShortUsage = "ABI Dumper $TOOL_VERSION + Dump ABI of an ELF object containing DWARF debug info +-Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory ++Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory + License: GNU LGPL or GNU GPL + + Usage: $CmdName [options] [object] +@@ -4276,6 +4276,11 @@ sub setSource(@) + + if(defined $File) + { ++ if(index($File, "(")!=-1) ++ { # Support for new elfutils (Fedora 30) ++ $File=~s/.+ \((\d+)\)/$1/; ++ } ++ + my $Name = undef; + + if($ID>=0) { +@@ -6504,7 +6509,7 @@ sub scenario() + if($ShowVersion) + { + printMsg("INFO", "ABI Dumper $TOOL_VERSION"); +- printMsg("INFO", "Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory"); ++ printMsg("INFO", "Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory"); + printMsg("INFO", "License: LGPL or GPL "); + printMsg("INFO", "This program is free software: you can redistribute it and/or modify it.\n"); + printMsg("INFO", "Written by Andrey Ponomarenko."); diff --git a/abi-dumper.spec b/abi-dumper.spec index e15874f..aa3291f 100644 --- a/abi-dumper.spec +++ b/abi-dumper.spec @@ -1,6 +1,6 @@ Name: abi-dumper Version: 1.1 -Release: 8%{?dist}.1 +Release: 9%{?dist} Summary: Tool to dump ABI of an ELF object containing DWARF debug info License: GPLv2 @@ -8,6 +8,7 @@ URL: http://github.com/lvc/abi-dumper/ Source0: https://github.com/lvc/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: abi-dumper-perl-brace.patch +Patch1: 0001-Support-for-new-elfutils-Fedora-30.patch BuildArch: noarch @@ -33,7 +34,7 @@ BuildRequires: txt2man Requires: elfutils Requires: vtable-dumper >= 1.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?perl_default_filter} @@ -72,6 +73,9 @@ mkdir -p %{buildroot}%{_mandir}/man1 %changelog +* Thu Jul 04 2019 Richard Shaw - 1.1-9 +- Appy patch to fix debuginfo ouput for Fedora 30+, fixes RHBZ#1726719. + * Thu May 30 2019 Jitka Plesnikova - 1.1-8.1 - Perl 5.30 rebuild