Fix SPDX licensing string

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -4,18 +4,15 @@
 /libabigail-1.0-git-43c06a8.tar.gz
 /libabigail-0.1-git-43c06a8.tar.gz
 /libabigail-1.0-git-ab1316b.tar.gz
-/libabigail-1.0-git-f0d319a.tar.gz
-/libabigail-1.0-git-a89b0d0.tar.gz
 /libabigail-1.0-git-164d17e.tar.gz
 /libabigail-1.0.rc0.tar.gz
 /libabigail-1.0.rc1.tar.gz
-/enum-value-wide-precision-on-32-bits-machine-patch.txt
 /libabigail-1.0.rc2.tar.gz
 /libabigail-1.0.rc3.tar.gz
-/fix-test-diff-pkg-patch.txt
 /libabigail-1.0.rc4.tar.gz
 /0001-Bug-19961-Distinguish-between-PI-executable-and-shar.patch
 /0002-Bug-19964-Cannot-load-function-aliases-on-ppc64.patch
+
 /libabigail-1.0.rc5.tar.gz
 /libabigail-1.0.rc6.tar.gz
 /0001-A-suppressed-diff-node-implies-suppressing-all-equiv.patch
@@ -37,12 +34,6 @@
 /libabigail-2.1.tar.gz
 /libabigail-2.2.tar.xz
 /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
 /0002-suppression-Add-has_strict_flexible_array_data_membe.patch
-/libabigail-2.5.tar.xz
-/libabigail-2.6.tar.xz
-/libabigail-2.7.tar.xz
-/libabigail-2.8.tar.xz
-/libabigail-2.9.tar.xz

0003-Replace-deprecated-mock-with-unittest.mock.patch

@@ -1,26 +0,0 @@
-From 8602d3c36dad05ada68feedc80926afadff448a2 Mon Sep 17 00:00:00 2001
-From: Maxwell G <maxwell@gtmx.me>
-Date: Sat, 13 Jan 2024 05:50:39 +0000
-Subject: [PATCH] Replace deprecated mock with unittest.mock
-
-Relates: https://fedoraproject.org/wiki/Changes/RemovePythonMockUsage
----
- tests/mockfedabipkgdiff.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
-index 1e56266..863cf7f 100644
---- a/tests/mockfedabipkgdiff.in
-+++ b/tests/mockfedabipkgdiff.in
-@@ -42,7 +42,7 @@ import tempfile
- import six
- 
- try:
--    from mock import patch
-+    from unittest.mock import patch
- except ImportError:
-     import sys
-     six.print_('mock is required to run tests. Please install before running'
--- 
-2.43.0
-

gating.yaml

@@ -1,19 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

libabigail.spec

@@ -1,47 +1,51 @@
-# dependencies are not available in RHEL
-%bcond abidb %{undefined rhel}
-
-%global tarball_revision 1
+%global tarball_revision 0
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 2.9
-Release: 1%{?dist}
+Version: 2.4
+Release: 3%{?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
+Source0: ftp://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz
+Patch1: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+Patch2: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch 
 
 BuildRequires: git
-BuildRequires: libbpf-devel
 BuildRequires: binutils-devel
 BuildRequires: gcc-c++
 BuildRequires: libtool
 BuildRequires: elfutils-devel
 BuildRequires: libxml2-devel
-BuildRequires: xxhash-devel
-BuildRequires: xz-devel >= 5.2.0
 BuildRequires: doxygen
-BuildRequires: python3-sphinx
+BuildRequires: python-sphinx
 BuildRequires: texinfo
-%if %{with abidb}
-BuildRequires: python3-GitPython
-BuildRequires: python3-libarchive-c
-Requires: python3-GitPython
-Requires: python3-libarchive-c
-%endif
-%if 0%{?fedora} || 0%{?epel}
-BuildRequires: dpkg
-BuildRequires: koji
-BuildRequires: python3-koji
-%endif
+BuildRequires: python2-devel
+BuildRequires: rpm-python
+BuildRequires: python2-mock
+BuildRequires: python2-koji
+BuildRequires: python-unittest2
+BuildRequires: python2-pyxdg
 BuildRequires: wget
+#For x-rpm mimetype definition!
+BuildRequires: mailcap
+BuildRequires: koji
+BuildRequires: python2-koji
+
+Requires: python2-pyxdg
+Requires: rpm-python
+Requires: koji
+Requires: python2-koji
+Requires: python2 >= 2.6
+Requires: wget
+#For x-rpm mimetype definition!
+Requires: mailcap
 
 %description
 The libabigail package comprises seven command line utilities:
-abidiff, kmidiff, abipkgdiff, abicompat, abidw, and abilint.
-The abidiff command line tool compares the ABI of two
+abidiff, kmidiff, abipkgdiff, abicompat, abidw, abilint and
+fedabipkgdiff.  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.
 Simarly, the kmidiff compares the kernel module interface of two Linux
@@ -50,7 +54,9 @@ two packages.  abicompat checks if a subsequent version of a shared
 library is still compatible with an application that is linked against
 it.  abidw emits an XML representation of the ABI of a given ELF
 shared library. abilint checks that a given XML representation of the
-ABI of a shared library is correct.
+ABI of a shared library is correct.  fedabipkgdiff 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.
 
 Install libabigail if you need to compare the ABI of ELF shared
 libraries.
@@ -68,44 +74,30 @@ 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} || 0%{?epel}
-%package fedora
-Summary: Utility to compare the ABI of Fedora packages
-BuildRequires: python3-devel
-BuildRequires: python3-koji
-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
+%setup -n %{tarball_name}
+# Create a git repo within the expanded tarball.
+git init
+git config user.name "Dodji Seketeli"
+git config user.email "dodji@redhat.com"
+git add .
+git commit -a -q -m "%{version} baseline."
+# Apply all the patches on top.
+git am %{patches}
+#As one of the patches touches a Makefile.am,
+# we need to regenerate the Makefile.in files.
+autoreconf
 
 %build
-%configure %{?with_abidb:--enable-abidb} --enable-ctf --enable-btf --disable-silent-rules --disable-zip-archive --disable-static
+%configure --enable-ctf --disable-python3 --disable-silent-rules --disable-zip-archive --disable-static
 make %{?_smp_mflags}
 pushd doc
 make html-doc
@@ -124,15 +116,19 @@ 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} || 0%{?epel}
-# Explicitly use Python 3 as the interpreter
-%py3_shebang_fix %{buildroot}%{_bindir}/fedabipkgdiff
-%endif
-
 %check
 time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log && exit 2)
 
-%ldconfig_scriptlets
+%post
+/sbin/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
+
+%postun -p /sbin/ldconfig
 
 %files
 %{_bindir}/abicompat
@@ -140,12 +136,10 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 %{_bindir}/abidw
 %{_bindir}/abilint
 %{_bindir}/abipkgdiff
+%{_bindir}/fedabipkgdiff
 %{_bindir}/kmidiff
-%if %{with abidb}
-%{_bindir}/abidb
-%endif
-%{_libdir}/libabigail.so.8
-%{_libdir}/libabigail.so.8.0.0
+%{_libdir}/libabigail.so.3
+%{_libdir}/libabigail.so.3.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
 %license LICENSE.txt license-change-2020.txt
@@ -163,107 +157,30 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 %license LICENSE.txt license-change-2020.txt
 %doc doc/manuals/html/*
 
-%if 0%{?fedora} || 0%{?epel}
-%files fedora
-%{_bindir}/fedabipkgdiff
-%endif
-
 %changelog
-* Thu Nov 06 2025 Dodji Seketeli <dodji@redhat.com> - 2.9-1
-- Update to upstream 2.9 tarball
-- Support new libabigail.so.8.0.0 SONAME
-- Run 'make check check-self-compare' instead of two separate make invocations.
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jul 04 2025 Dodji Seketeli  <dodji@redhat.com> - 2.8-1
-- Update to usptream 2.8 tarball
-- Support new libabigail.so.7.0.0 SONAME
-
-* Fri Apr 11 2025 Dodji Seketeli  <dodji@redhat.com> - 2.7-1
-- Update to upstream 2.7 tarball
-- Do not build with by default XXH_INLINE_ALL anymore
-- Drop xxhash-static dependency
-- Add xz-devel >= 5.2.0 dependency to support reading xz-compressed binaries
-- Support new libabigail.so.6.0.0 SONAME
-
-* Tue Feb 04 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6-3
-- Limit fedabipkgdiff to Fedora and EPEL
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Nov 1 2024 Dodji Seketeli <dodji@redhat.com> - 2.6-1
-- Update to upstream 2.6 tarball
-- Add xxhash-devel as BuildRequires
-- Update library to libabigail.so.5.0.0
-
-* Fri Jul 26 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.5-4
-- Add runtime dependencies of abidb
-- Disable abidb on RHEL
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu May 16 2024 Adam Williamson <awilliam@redhat.com> - 2.5-2
-- Rebuild with fixed CI metadata
-
-* Thu Apr 18 2024 Dodji Seketeli <dodji@redhat.com> - 2.5-1
-- Update to upstream 2.5 tarball
-- Drop patches
-  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
-  0002-suppression-Add-has_strict_flexible_array_data_membe.patch 
-  0003-Replace-deprecated-mock-with-unittest.mock.patch
-- Package libabigail.so.4 rather than the previous libabigail.so.3.
-- Add abidb to the package
-  Added BuildRequires: python3-GitPython, python3-libarchive-c
-- Better handle error handling when tests fails.
-
-* Fri Jan 26 2024 Maxwell G <maxwell@gtmx.me> - 2.4-7
-- Remove python3-mock dependency
-- Apply patch 0003-Replace-deprecated-mock-with-unittest.mock.patch
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-4
+* Mon Nov 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
 - Fix SPDX licensing string
 
-* Wed Nov 15 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
-- Fix sourceware.org/PR31017
-  "Support Flex array conversion suppression"
-  Apply patch 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
-
-* Tue Nov 14 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
+* Wed Nov 15 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.
-- Add git as a build requirement
+- Fix sourceware.org/PR31017
+  "Support Flex array conversion suppression"
+  Apply patch 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+- Use SPDX license description
+- Add git as build requirement
+- Use git to apply the patches as they apply binary changes and patch
+  doesn't know how to handle these.
+- As the paches touch Makefile.am files, run autoreconf after
+  applying the patches.
+
 
 * Fri Oct 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
 - Update to upstream 2.4 tarball
-- Drop patches
-  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch and
-  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch
-- Enable build with support for BTF
-- Added BuildRequires: libbpf-devel
 - Support soname bumped to libabigail.so.3.0.0
 
-* Thu Oct 12 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-3
-- Use the SPDX format to express the license of the package
-- Fix a compilation warning
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Thu Apr 27 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-1
 - Update to upstream 2.3 release
 - Don't do "dos2unix doc/manuals/html/_static/jquery.js"
@@ -271,9 +188,6 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
   Hence, don't BuildRequires: dos2unix anymore.
 - 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.
@@ -284,26 +198,16 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 - 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
+* Wed Jan 27 2021 Dodji Seketeli <dodji@redhat.com> - 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:
+    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
       Bug 26992 - Try harder to resolve declaration-only classes
@@ -321,98 +225,46 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
       abg-ir: Optimize calls to std::string::find() for a single char.
       abipkgdiff: Address operator precedence warning
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
 * 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
+- Add "make check-self-compare" to regression tests
+- Add BuildRequires python2-koji
 
 * Tue Feb 25 2020 Dodji Seketeli <dodji@redhat.com> - 1.7-1
 - Update to upstream 1.7
+- Add Koji as BuildRequires
+  Fixes: RHBZ#1799575
 
-* 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
+* Thu Mar 28 2019 Dodji Seketeli <dodji@redhat.com> - 1.6-1
 - Update to upstream 1.6
-- Removed patches that are now upstream
+- Remove patches:
   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
+* Mon Nov 12 2018 Dodji Seketeli <dodji@redhat.com> - 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
+* Fri Oct 26 2018 Dodji Seketeli <dodji@seketeli.org> - 1.5-1
+- Remove dpkg from buildrequires
 
-* Wed Jul 25 2018 Nils Philippsen <nils@tiptoe.de> - 1.4-2
-- explicitly use Python 3 for fedabipkgdiff
+* Thu Oct 25 2018 Dodji Seketeli <dodji@seketeli.org> - 1.5-1
+- Update to upstream 1.5 tarball
 
 * Fri Jul 13 2018 Dodji Seketeli <dodji@redhat.com> - 1.4-1
 - Update to upstream 1.4
-- Merge change to build fedabipkgdiff in Fedora only.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3-2
-- Rebuilt for Python 3.7
+- Merge change to build fedabipkgdiff in Fedora only
 
 * Wed May 16 2018 Dodji Seketeli <dodji@redhat.com> - 1.3-1
-- Update to upstream 1.3
-- Use python3 modules
+- Update to upstream 1.3 version
+- Make sure to build against python2.
 
-* 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@seketeli.org> - 1.2-1
 - Update to upstream 1.2
 
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-4
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-2
-- Switch to %%ldconfig_scriptlets
-
-* Thu Jan 25 2018 Dodji Seketeli <dodji@redhat.com> - 1.1-1
+* Tue Jan 30 2018 Dodji Seketeli <dodji@redhat.com> - 1.1-1
 - Update to upstream 1.1
-- 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
 - Add missing %%{dist} to release.
@@ -432,26 +284,11 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
   0001-Fix-aborting-when-reading-.foo-symbols-from-a-ppc64-.patch
 - Add kmidiff to the RPM
 
-* Fri Oct 06 2017 Troy Dawson <tdawson@redhat.com> - 1.0-0.13.rc6.4
-- Fix rawhide FTBFS - Added Buildrequires python2-koji
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.12.rc6.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.11.rc6.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.10.rc6.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.9.rc6.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
 * Fri Dec  9 2016 Dodji Seketeli <dodji@redhat.com> - 1.0-0.8.rc6.4
 - Fix upstream bug - Fix aborting when reading .foo symbols from a ppc64 binary
 
 * Mon Dec  5 2016 Dodji Seketeli <dodji@redhat.com> - 1.0-0.8.rc6.3
-- Fix upstream Bug 20927 - Segfault when abidiff is invoked with $HOME empty
+- Fix upstream Bug 20927 - Segfault when abidiff is invoked with $HOME not set
   Apply the upstream patch here.
 
 * Sat Nov 26 2016 Dodji Seketeli <dodji@redhat.com> - 1.0-0.8.rc6.2
@@ -459,18 +296,11 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
   This implies applying upstream patch:
    "[PATCH] A suppressed diff node implies suppressing all equivalent nodes too"
 
-* Wed Nov 23 2016 Dodji Seketeli <dodji@redhat.com> - 1.0-0.8.rc6.1
+* Thu Nov 24 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc6.1
 - Update to upstream 1.0.rc6 tarball
-- Add wget as a build and runtime requirement.  It's useful for fedabipkgdiff
-
-* Mon Aug 29 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc5.5
-- Update the package description to mention fedabipkgdiff
-
-* Mon Aug 29 2016 Chenxiong Qi <cqi@redhat.com> - 1.0-0.8.rc5.4
-- Add pyxdg, rpm-python, koji and python2 as runtime dependencies
-
-* Tue Jun 28 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc5.3
-- Fix previous change log entry
+- Add pyxdg, rpm-python, koji and python2 as runtime dependencies.
+- Add wget as a build and runtime requirement.  It's useful for fedabipkgdiff.
+- Update package description to mention fedabipkgdiff
 
 * Tue Jun 28 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc5.2
 - Add README
@@ -478,7 +308,7 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 * Mon Jun 27 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc5.1
 - Update to upstream 1.0.rc5 tarball
 - Add new build requires for new fedabipkgdiff tool:
-  python2-devel, rpm-python, python2-mock, koji, pyxdg, python2-unittest2
+  python2-devel, rpm-python, python-mock, koji, pyxdg, python-unittest2
 - Add new %%{_bindir}/fedabipkgdiff binary and
   %%{_libdir}/libabigail/default.abignore configuration file to the set
   of distributed files. 
@@ -486,10 +316,6 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
   0001-Bug-19961-Distinguish-between-PI-executable-and-shar.patch
   0002-Bug-19964-Cannot-load-function-aliases-on-ppc64.patch
 
-
-* Mon May  2 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc4.3%{?dist}
-- Add README file
-
 * Mon Apr 25 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc4.2
 - Fix PIE and ppc64 function aliases handling.
   The exact two upstream bugs fixed are:
@@ -499,32 +325,23 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 
 * Sun Apr 17 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc4.1
 - Update to upstream 1.0.rc4
-- Remove fix-test-diff-pkg-patch.txt as it was applied upstream.
 
-* Tue Mar  8 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc3.2
-- Fix test-diff-pkg regression test failure due to a race condition.
+* Fri Mar 25 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.8.rc3.1
+- Bump pseudo epoch to 0.8 so that we have: 1.0-0.8.rc3.1
 
 * Tue Mar  8 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc3.1
 - Update to upstream 1.0.rc3
 - Add gcc-c++ as BuildRequires
 - Measure the time taken by regression tests
 
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.rc2.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jan  7 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc2.1
-- Update to upstream 1.0.rc2
-- This fixes an important regression in the handling of binaries
-  which debug info have been compressed with dwz.
-- Fix source tarball URL.
-
-* Wed Jan  6 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc1.3
+* Fri Jan  8 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc2.1
+- Update to upstream release 1.0.rc2
 - Run make check in // if possible
 
 * Wed Jan  6 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc1.2
 - Add/Remove info pages to/from info pages database after install/before remove
 
-* Tue Jan  5 2016 Dodji Seketeli <dodji@redhat.com> - 1.0-0.rc1.1
+* Wed Jan  6 2016 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.rc1.1
 - Ship man/info pages right into the main package, along with the main
   programs.
 - Update to upstream release 1.0.rc1
@@ -535,10 +352,9 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
    libabigail/19355 - Libabigail slow on r300_dri.so
    Numerous other bug fixes and cleanups
 
-* Mon Nov 16 2015 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.7.rc0.20151116gitd8bcceb
+* Tue Nov 17 2015 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.7.rc0
 - Update to upstream release 1.0.rc0
 - Take a tarball built using make dist now.
-- Update the comments in the spec regarding how the tarball has been generated.
 - Do not run autoreconf -i anymore, during the build.
 
 * Wed Sep 9 2015 Dodji Seketeli <dodji@seketeli.org> - 1.0-0.6.20150909git164d17e
@@ -558,11 +374,6 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 - cat tests/test-suite.log when check fails
 - Update description to add abipkgdiff
 
-* Mon Jul 27 2015 Sinny Kumari <ksinny@gmail.com> - 1.0-0.5.20150727gitf0d319a
-- Update to upstream git commit hash f0d319a. Returns different exit status code
-  when abipkgdiff runs and various other bug fixes in libabigail.
-- Adjust date, git_revision and Release macros
-
 * Mon Jul 20 2015 Sinny Kumari <ksinny@gmail.com> - 1.0-0.4.20150720gitab1316b
 - Update to upstream git commit hash ab1316b. It brings various bug fixes and a
   new abipkgdiff tool to detect abi changes at package level.
@@ -577,7 +388,7 @@ time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log
 - Tarball name format is now clearer: %%{name}-%%{version}-git-%%{git_revision}
 - Add new macro tarball_name for that
 - Adjust the Source0, git_revision, date, Release macros
-- Adjust the %%setup directive to the fact that the tarball now extracts to
+- Adjust the %setup directive to the fact that the tarball now extracts to
   a directory named %%{name}-%%{version}-git-%%{git_revision}
 - Adjust the packaging of the man pages as some of them moved from
   section 7 to section 1.

plans/ci.fmf

@@ -1,5 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +1,3 @@
-SHA512 (libabigail-2.9.tar.xz) = 5bdf5ec49a5931a61bf28317b41eee583d6277d00ac621b2d2a97bbc0d816c3662bcfe13a5ac7aeee11c947afb69a5a0a9a8015fcebad09965b45af9b1e23606
+SHA512 (libabigail-2.4.tar.xz) = f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
+SHA512 (0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch) = f2145d6f9552dcd818228c08a68b6d54f7d79c53d79c2fff18f2664ac3684d2da09670247e482a18ee8f3b44fafbac425ca8d357ea4c621212b84b8180bd989e
+SHA512 (0002-suppression-Add-has_strict_flexible_array_data_membe.patch) = 28b8eecba059e2e08e907ecc8ee9e03d57acdc94ce4e1aea4b8c51cf78c7711812215539149e5d24e77fb4c7a6b62c2e5062e7ff87b69d4ee2a85d2205e8b00b

tests/libabigail-testsuite/main.fmf

@@ -1,13 +0,0 @@
-summary: libabigail testing by upstream testsuite
-component:
-- libabigail
-test: ./test.sh
-tier: 1
-framework: beakerlib
-require+:
-- libabigail
-- rpm-build
-- yum-utils
-- gcc-c++
-- coreutils
-duration: 1h

tests/libabigail-testsuite/test.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-BUILD_USER=${BUILD_USER:-lbbglbld}
-TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-10}
-PACKAGE="libabigail"
-REQUIRES="$PACKAGE rpm-build gcc-c++"
-if rlIsFedora; then
-  REQUIRES="$REQUIRES dnf-utils"
-else
-  REQUIRES="$REQUIRES yum-utils"
-fi
-
-# variables needed for 'make check'
-export RPM_PACKAGE_NAME=$(rpm -q --qf='%{NAME}\n' $PACKAGE)
-export RPM_PACKAGE_VERSION=$(rpm -q --qf='%{VERSION}\n' $PACKAGE)
-export RPM_PACKAGE_RELEASE=$(rpm -q --qf='%{RELEASE}\n' $PACKAGE)
-export RPM_ARCH=$(rpm -q --qf='%{ARCH}\n' $PACKAGE)
-
-rlJournalStart
-  rlPhaseStartSetup
-    rlShowRunningKernel
-    rlAssertRpm --all
-    rlRun "TmpDir=\$(mktemp -d /home/libabigail.XXXXXXXXXX)"  # work in /home due to high demands on disk space
-    rlRun "pushd $TmpDir"
-    rlFetchSrcForInstalled $PACKAGE
-    rlRun "useradd -N $BUILD_USER" 0,9
-    [ "$?" == "0" ] && rlRun "del=yes"
-    rlRun "chown -R $BUILD_USER:users $TmpDir"
-  rlPhaseEnd
-
-  rlPhaseStartSetup "build libabigail"
-    rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
-    rlRun "yum-builddep -y $TmpDir/SPECS/*.spec &>$TmpDir/yum-builddep.log"
-    rlRun "rlFileSubmit $TmpDir/yum-builddep.log yum-builddep.log"
-    rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bc $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
-    rlRun "rlFileSubmit $TmpDir/rpmbuild.log rpmbuild.log"
-    rlRun "cd $(dirname `find $TmpDir -name configure -type f`)"
-  rlPhaseEnd
-
-  rlPhaseStartTest "run testsuite"
-    rlRun "su -c 'make check |& tee $TmpDir/testsuite.log' $BUILD_USER"
-    rlRun "rlFileSubmit tests/test-suite.log test-suite.log"
-    rlRun "rlFileSubmit $TmpDir/testsuite.log testsuite.log"
-  rlPhaseEnd
-
-  rlPhaseStartTest "evaluate results"
-    rlRun "grep -E '^# FAIL:|^# XPASS:|^# ERROR:' $TmpDir/testsuite.log | grep -vqE ':\s*0$'" 1
-    rlRun "tests_count=\$(grep -E '^PASS:' $TmpDir/testsuite.log | wc -l)"
-    [ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlRun "popd"
-    rlRun "rm -r $TmpDir"
-    [ "$del" == "yes" ] && rlRun "userdel -f -r $BUILD_USER"
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd