.gitignore

@@ -1 +1 @@
-SOURCES/libabigail-2.6.tar.xz
+SOURCES/libabigail-2.5.tar.xz

.libabigail.metadata

@@ -1 +1 @@
-98ce69006ba6401f6a8d178b1b9b60390bcc8d68 SOURCES/libabigail-2.6.tar.xz
+121ce659993be416f2695d8fe2d40c26078bd644 SOURCES/libabigail-2.5.tar.xz

SPECS/libabigail.spec

@@ -1,8 +1,8 @@
-%global tarball_revision 1
+%global tarball_revision 0
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 2.6
+Version: 2.5
 Release: 1%{?dist}
 Summary: Set of ABI analysis tools
 
@@ -11,27 +11,19 @@ URL: https://sourceware.org/libabigail/
 Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz
 
 BuildRequires: git
-BuildRequires: libbpf-devel
-BuildRequires: binutils-devel
 BuildRequires: gcc-c++
 BuildRequires: libtool
 BuildRequires: elfutils-devel
+BuildRequires: libbpf-devel
 BuildRequires: libxml2-devel
-BuildRequires: xxhash-devel
 BuildRequires: doxygen
-BuildRequires: python3-devel
 BuildRequires: python3-sphinx
+BuildRequires: python3-devel
 BuildRequires: texinfo
-%if 0%{?fedora}
-BuildRequires: dpkg
-BuildRequires: koji
-BuildRequires: python3-koji
-%endif
-BuildRequires: wget
 
 %description
-The libabigail package comprises seven command line utilities:
+The libabigail package comprises six command line utilities:
-abidiff, kmidiff, abipkgdiff, abicompat, abidw, and abilint.
+abidiff, kmidiff, abipkgdiff, abicompat, abidw, and abilint
 The abidiff command line tool compares the ABI of two
 ELF shared libraries and emits meaningful textual reports about
 changes impacting exported functions, variables and their types.
@@ -59,45 +51,20 @@ application binary interfaces of shared libraries in the ELF format.
 
 %package doc
 Summary: Man pages, texinfo files and html manuals of libabigail
+Requires(post): info
+Requires(preun): info
 
 %description doc
 This package contains documentation for the libabigail tools in the
 form of man pages, texinfo documentation and API documentation in html
 format.
 
-%if 0%{?fedora}
-%package fedora
-Summary: Utility to compare the ABI of Fedora packages
-BuildRequires: python3-devel
-BuildRequires: python3-koji
-BuildRequires: python3-mock
-BuildRequires: python3-rpm
-BuildRequires: python3-pyxdg
-#For x-rpm mimetype definition!
-BuildRequires: mailcap
-BuildRequires: make
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: curl
-Requires: koji
-Requires: python3 >= 3.6
-Requires: python3-koji
-Requires: python3-pyxdg
-Requires: python3-rpm
-#For x-rpm mimetype definition!
-Requires: mailcap
-
-%description fedora
-This package contains the fedabipkgdiff command line utility, which
-interacts with the Fedora Build System over the internet to let the
-user compare the ABI of Fedora packages without having to download
-them manually.
-%endif
-
 %prep
 %autosetup -v -S git
+autoreconf
 
 %build
-%configure --enable-btf --enable-ctf --disable-silent-rules --disable-zip-archive --disable-static
+%configure --enable-btf --disable-deb  --disable-fedabipkgdiff --disable-zip-archive --disable-static
 make %{?_smp_mflags}
 pushd doc
 make html-doc
@@ -116,11 +83,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 # default 'install' target of the makefile.
 make -C doc/manuals install-man-and-info-doc DESTDIR=%{buildroot}
 
-%if 0%{?fedora}
-# Explicitly use Python 3 as the interpreter
-%py3_shebang_fix %{buildroot}%{_bindir}/fedabipkgdiff
-%endif
-
 %check
 time make %{?_smp_mflags} check  || (cat tests/test-suite.log && exit 2)
 time make %{?_smp_mflags} check-self-compare || (cat tests/test-suite.log && exit 2)
@@ -129,7 +91,16 @@ if test $? -ne 0; then
   cat tests/tests-suite.log
 fi
 
-%ldconfig_scriptlets
+%post
+%?ldconfig
+/usr/sbin/install-info %{_infodir}/abigail.info* %{_infodir}/dir 2>/dev/null || :
+
+%preun
+if [ $1 -eq 0 ]; then
+  /usr/sbin/install-info --delete %{_infodir}/abigail.info* %{_infodir}/dir 2>/dev/null || :
+fi
+
+%ldconfig_postun
 
 %files
 %{_bindir}/abicompat
@@ -138,8 +109,8 @@ fi
 %{_bindir}/abilint
 %{_bindir}/abipkgdiff
 %{_bindir}/kmidiff
-%{_libdir}/libabigail.so.5
+%{_libdir}/libabigail.so.4
-%{_libdir}/libabigail.so.5.0.0
+%{_libdir}/libabigail.so.4.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
 %license LICENSE.txt license-change-2020.txt
@@ -157,112 +128,60 @@ fi
 %license LICENSE.txt license-change-2020.txt
 %doc doc/manuals/html/*
 
-%if 0%{?fedora}
-%files fedora
-%{_bindir}/fedabipkgdiff
-%endif
-
 %changelog
-* Fri Dec 13 2024 Dodji Seketeli <dodji@redhat.com> - 2.6-1
-- Update to upstream 2.6 tarball
-- Update to changing SONAME (libabigail.so.5.0.0)
-- Add BuildRequires xxhash-devel
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.5-3
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.5-2
-- Bump release for June 2024 mass rebuild
-
 * 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
-- Enable abidb
 - Add BuildRequires: python3-devel
-- Add libabigail.so.4 and libabigail.so.4.0.0 to the RPM
+- Remove BuildRequires: %%{_bindir}/python3
-
+
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-6
+* Fri Nov 17 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Fix SPDX Licensing string
-
+
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
+* Thu Nov 16 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Apply patch: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
-
+  Resolves: https://issues.redhat.com/browse/RHEL-16614
-* Mon Nov 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-4
+- Apply patch: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
-- Fix SPDX licensing string
+  Resolves: https://issues.redhat.com/browse/RHEL-16629
-
+- Add git as a build requirement as we need git to apply the patches
-* Wed Nov 15 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
+  aboves that apply binaries.
-- Fix sourceware.org/PR31017
+- Use %%autosetup to handle applying the patches using git.
-  "Support Flex array conversion suppression"
+- autoreconf after the patches touched at least one Makefile.am file.
-  Apply patch 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+
-
+* Wed Nov 01 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
-* Tue Nov 14 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
+- Update to upstream 2.4
-- Fix sourceware.org/PR31045
+- Use SPDX licensing naming
-  "Don't try setting translation unit for unique types"
+- Build BTF support
-  Apply patch
+- Add BuildRequires: libbpf-devel
-  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch.
+- Update for SONAME bump
-  That patch is applied in upstream mainline and will be available in
+- Show details about the check and check-self-targets targets
-  libabigail 2.5.
+  separatly.
-- Use %%autosetup instead of the previous %%setup and %%patch macros.
+- Resolves: RHEL-12491
-- Add git as a build requirement
+
-
+* Tue May 09 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-1
-* Fri Oct 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
+- Update to upstream 2.3
-- Update to upstream 2.4 tarball
+- Remove the dos2unix surgery as it's now useless
-- Drop patches
+- Update for the soname bump
-  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch and
+- Resolves: RHELPLAN-154803
-  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch
+
-- Enable build with support for BTF
+* Tue Dec 13 2022 Dodji Seketeli <dodji@redhat.com> - 2.2-1
-- Added BuildRequires: libbpf-devel
+- Update to upstream 2.2
-- Support soname bumped to libabigail.so.3.0.0
+- Switch to .xz tarball
-
+- Resolves: rhbz#2152553
-* Thu Oct 12 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-3
+
-- Use the SPDX format to express the license of the package
+* Wed Nov 2 2022 Martin Cermak <mcermak@redhat.com> - 2.1-2
-- Fix a compilation warning
+- NVR bump and rebuild
-
+
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
+* Fri Sep 30 2022 Dodji Seketeli <dodji@redhat.com> - 2.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+- Update to upstream 2.1 release.
-
+- Remove the now useless text about getting the source from git.
-* Thu Apr 27 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-1
+- Update the license reference.
-- Update to upstream 2.3 release
+- Resolves: rhbz#1944096
-- Don't do "dos2unix doc/manuals/html/_static/jquery.js"
+
-  The file doc/manuals/html/_static/jquery.js is no more.
+* Thu Jan 28 2021 Dodji Seketeli <dodji@redhat.com> - 1.8.1-1
-  Hence, don't BuildRequires: dos2unix anymore.
+- Update to upsteram fixes up to libabigail-1.8.1
-- The libaigail binary is now libabigail.so.2.0.0.
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec  2 2022 Dodji Seketeli <dodji@redhat.com> - 2.2-1
-- Update to upstream 2.2 release.
-- Switch to a tar.xz tarball.
-
-* Wed Sep 21 2022 Dodji Seketeli <dodji@redhat.com> - 2.1-1
-- Update to upstream 2.1
-- Add libabigail.so.1 and libabigail.so.1.0.0 to the package.
-- Enable CTF support when running the tests.
-- Add binutils-devel as BuildRequires, for CTF.
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct  4 2021 Dodji Seketeli <dodji@redhat.com> - 2.0-1
-- Update to upstream 2.0 tarball
-- Change License to ASL 2.0 to comply with the upstream license change.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Feb 25 2021 Dodji Seketeli <dodji@redhat.com> - 1.8.2-1
-- Update to upstream 1.8.2 point release
-- Require dpkg and koji only on Fedora builds only.
-
-* Wed Jan 27 2021 Dodji Seketeli <dodji@seketeli.org> - 1.8.1-1
-- Update to upstream fixes up to libabigail-1.8.1
   This encompasses this fixes, compared to the last 1.8 release:
       ir: Add better comments to types_have_similar_structure
       mainpage: Update web page for 1.8 release
@@ -280,84 +199,33 @@ fi
       Add qualifier / typedef / array / pointer test
       abg-ir: Optimize calls to std::string::find() for a single char.
       abipkgdiff: Address operator precedence warning
+-Resolves: rhbz#1901016
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
+* Tue Aug 14 2018 Petr Viktorin <pviktori@redhat.com> - 1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Fix BuildRequires for /usr/bin/python3
-
+- Resolves: #1615539
-* Tue Dec  1 2020 Dodji Seketeli <dodji@redhat.com> - 1.8-1
-- Update to upstream 1.8
-- Add 'make check-self-compare' to the regression tests run.
-- BuildRequires python3-koji
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Feb 25 2020 Dodji Seketeli <dodji@redhat.com> - 1.7-1
-- Update to upstream 1.7
-
-* Mon Feb 17 2020 Sinny Kumari <skumari@fedoraproject.org> - 1.6-4
-- Add koji as BuildRequires
-- Fixes: RHBZ#1799575
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Mar 27 2019 Dodji Seketeli <dodji@redhat.com> - 1.6-1
-- Update to upstream 1.6
-- Removed patches that are now upstream
-  Support-having-several-debuginfo-search-dirs-for-a-b.patch
-  Add-a-fail-no-debug-info-to-abidiff.patch
-
-* Wed Mar 13 2019 Mathieu Bridon <bochecha@daitauha.fr> - 1.5-4
-- Remove unnecessary dependencies: python3-unittest2 and wget which
-  was referred to twice.
-- Better group dependencies: Many dependencies are only required for
-  fedabipkgdiff, so let's put them under the right conditional.
-- Split fedabipkgdiff to its own subpackage
-    This tool is very specific, and only useful to Fedora developers,
-    not all developers.  It also has lots of dependencies which aren't
-    required by the other tools.  Splitting it to its own specialized
-    package makes the main package, with its library and utilities,
-    much lighter.
-
-* Thu Mar  7 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 1.5-4
-- Remove obsolete requirements for %%post/%%preun scriptlets
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Nov 12 2018 Dodji Seketeli <dodji@seketeli.org> - 1.5-2
-- Apply patches
-  Support-having-several-debuginfo-search-dirs-for-a-b.patch and
-  Add-a-fail-no-debug-info-to-abidiff.patch
-
-* Thu Oct 25 2018 Dodji Seketeli <dodji@seketeli.org> - 1.5-1
-- Update to upstream 1.5
-
-* Wed Jul 25 2018 Nils Philippsen <nils@tiptoe.de> - 1.4-2
-- explicitly use Python 3 for fedabipkgdiff
 
-* Fri Jul 13 2018 Dodji Seketeli <dodji@redhat.com> - 1.4-1
+* Mon Jul 16 2018 Dodji Seketeli <dodji@redhat.com> - 1.4-1
-- Update to upstream 1.4
+- Update to upstream 1.4 version
-- Merge change to build fedabipkgdiff in Fedora only.
+- Remove disable-runtestdefaultsupprs.py.patch
+- Add enable-python-when-no-fedabipkgdiff-is-defined.patch.txt
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
+* Wed Jun 20 2018 Dodji Seketeli <dodji@redhat.com> - 1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Add patch disable-runtestdefaultsupprs.py.patch
+  This disables the runtestdefaultsupprs.py patch as it's timeouting.
+  It's running fine locally though.
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3-2
+* Wed Jun 20 2018 Dodji Seketeli <dodji@redhat.com> - 1.3-2
-- Rebuilt for Python 3.7
+- Remove dpkg and koji dependencies
 
 * Wed May 16 2018 Dodji Seketeli <dodji@redhat.com> - 1.3-1
 - Update to upstream 1.3
-- Use python3 modules
+- Use python3.
 
 * Mon Mar 19 2018 Dodji Seketeli <dodji@redhat.com> - 1.2-2
 - Depend on Koji only on Fedora
 
-* Mon Mar  5 2018 Dodji Seketeli <dodji@redhat.com> - 1.2-1
+* Tue Mar  6 2018 Dodji Seketeli <dodji@redhat.com> - 1.2-1
 - Update to upstream 1.2
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-4
@@ -374,7 +242,7 @@ fi
 - Use python2-sphynx, rpm-python2, python2-rpm rather than
   python-sphinx, rpm-python.
 
-* Wed Nov 22 2017 Dodji Seketeli <dodji@seketeli.org> - 1.0-1
+* Wed Nov 22 2017 Dodji Seketeli <dodji@redhat.com> - 1.0-1
 - Add missing %%{dist} to release.
 
 * Tue Nov 7 2017 Dodji Seketeli <dodji@redhat.com> - 1.0-1