diff --git a/.gitignore b/.gitignore index 9a630ba..c8b01a3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ /abi-dumper-1.0.tar.gz /abi-dumper-1.1.tar.gz /abi-dumper-1.2.tar.gz -/abi-dumper-1.4.tar.gz 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 d8f26d4..439ef1b 100644 --- a/abi-dumper.spec +++ b/abi-dumper.spec @@ -1,16 +1,20 @@ Name: abi-dumper -Version: 1.4 -Release: 4%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Tool to dump ABI of an ELF object containing DWARF debug info -License: GPL-2.0-only AND LGPL-2.1-or-later +License: GPLv2 URL: http://github.com/lvc/abi-dumper/ Source0: https://github.com/lvc/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: coreutils +%if 0%{?rhel} +BuildRequires: perl +%else BuildRequires: perl-interpreter +%endif BuildRequires: perl-generators BuildRequires: perl(Cwd) BuildRequires: perl(Data::Dumper) @@ -23,10 +27,14 @@ BuildRequires: perl(Getopt::Long) BuildRequires: perl(Storable) BuildRequires: perl(strict) BuildRequires: sed +# https://bugzilla.redhat.com/show_bug.cgi?id=1741795 +%if ! 0%{?rhel} > 7 BuildRequires: txt2man +%endif Requires: elfutils Requires: vtable-dumper >= 1.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?perl_default_filter} @@ -50,69 +58,25 @@ mkdir -p %{buildroot}%{_prefix} chmod 0755 %{buildroot}%{_bindir}/%{name} +%if ! 0%{?rhel} > 7 # Create manpage mkdir -p %{buildroot}%{_mandir}/man1 %{__perl} abi-dumper.pl --help | sed "s|:$||g" | \ txt2man -t ABI-DUMPER -s 1 -v "User Commands" -r "ABI Dumper %{version}" > \ %{buildroot}%{_mandir}/man1/%{name}.1 +%endif %files %license LICENSE %doc README.md %{_bindir}/%{name} +%if ! 0%{?rhel} > 7 %{_mandir}/man1/%{name}.1* +%endif %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jan 11 2025 Richard Shaw - 1.4-1 -- Update to 1.4. - -* Wed Jul 17 2024 Fedora Release Engineering - 1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 07 2023 Richard Shaw - 1.2-9 -- Update license to SPDX format. - -* Wed Jan 18 2023 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 30 2022 Jitka Plesnikova - 1.2-6 -- Perl 5.36 rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Jitka Plesnikova - 1.2-3 -- Perl 5.34 rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Sun Nov 22 2020 Richard Shaw - 1.2-1 - Update to 1.2. diff --git a/sources b/sources index 53b2634..fa5bba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abi-dumper-1.4.tar.gz) = e5a7d59c9a2b3f18ce7b64c2a1d96efcd73084cf651dfc1833755621c21b7edd7e2fa7c194ad7c5b6658021432241bd47b30fe36640e5f1e0bee6e6dcf913ea0 +SHA512 (abi-dumper-1.2.tar.gz) = cb081a8aaa548bb2360cfe55d4258c263990a4cc36feaabdafa0dc32252d19ce3ce0209e6af14c03157a144fea0e5ecb6700848f74b4da4c3ee2cdb6f0d860d2