From 267b4e0c0ea5d1dbe7c36e4a0e2a47ef1a93a60d Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 30 Sep 2022 11:26:11 +0200 Subject: [PATCH] Update to upstream release 2.1 Signed-off-by: Dodji Seketeli --- .gitignore | 1 + libabigail.spec | 184 +++++++++++++----------------------------------- sources | 2 +- 3 files changed, 50 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index 400eadc..ed46288 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /libabigail-1.8.tar.gz /libabigail-1.8.1.tar.gz /libabigail-1.8.2.tar.gz +/libabigail-2.1.tar.gz diff --git a/libabigail.spec b/libabigail.spec index 815d94a..f6aeae1 100644 --- a/libabigail.spec +++ b/libabigail.spec @@ -1,12 +1,12 @@ -%global tarball_revision 1 +%global tarball_revision 0 %global tarball_name %{name}-%{version} Name: libabigail -Version: 1.8.2 -Release: 3%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Set of ABI analysis tools -License: LGPLv3+ +License: ASL 2.0 URL: https://sourceware.org/libabigail/ Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.gz @@ -15,19 +15,14 @@ BuildRequires: libtool BuildRequires: elfutils-devel BuildRequires: libxml2-devel BuildRequires: doxygen +BuildRequires: %{_bindir}/python3 BuildRequires: python3-sphinx BuildRequires: texinfo BuildRequires: dos2unix -%if 0%{?fedora} -BuildRequires: dpkg -BuildRequires: koji -BuildRequires: python3-koji -%endif -BuildRequires: wget %description -The libabigail package comprises seven command line utilities: -abidiff, kmidiff, abipkgdiff, abicompat, abidw, and abilint. +The libabigail package comprises six command line utilities: +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. @@ -55,45 +50,19 @@ 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 %setup -n %{tarball_name} %build -%configure --disable-silent-rules --disable-zip-archive --disable-static +%configure --disable-deb --disable-fedabipkgdiff --disable-zip-archive --disable-static make %{?_smp_mflags} pushd doc make html-doc @@ -113,11 +82,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' make -C doc/manuals install-man-and-info-doc DESTDIR=%{buildroot} dos2unix doc/manuals/html/_static/jquery.js -%if 0%{?fedora} -# Explicitly use Python 3 as the interpreter -pathfix.py -i %{__python3} -pn %{buildroot}%{_bindir}/fedabipkgdiff -%endif - %check time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log && exit 2) @@ -125,7 +89,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 @@ -134,11 +107,11 @@ fi %{_bindir}/abilint %{_bindir}/abipkgdiff %{_bindir}/kmidiff -%{_libdir}/libabigail.so.0 -%{_libdir}/libabigail.so.0.0.0 +%{_libdir}/libabigail.so.1 +%{_libdir}/libabigail.so.1.0.0 %{_libdir}/libabigail/default.abignore %doc README AUTHORS ChangeLog -%license COPYING COPYING-LGPLV3 COPYING-GPLV3 +%license LICENSE.txt license-change-2020.txt %{_mandir}/man1/* %{_mandir}/man7/* %{_infodir}/abigail.info* @@ -150,28 +123,18 @@ fi %{_datadir}/aclocal/abigail.m4 %files doc -%license COPYING COPYING-LGPLV3 COPYING-GPLV3 +%license LICENSE.txt license-change-2020.txt %doc doc/manuals/html/* -%if 0%{?fedora} -%files fedora -%{_bindir}/fedabipkgdiff -%endif - %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.8.2-3 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Fri Sep 30 2022 Dodji Seketeli - 2.1-1 +- Update to upstream 2.1 release. +- Remove the now useless text about getting the source from git. +- Update the license reference. +- Resolves: rhbz#1944096 -* Fri Apr 16 2021 Mohan Boddu - 1.8.2-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Thu Feb 25 2021 Dodji Seketeli - 1.8.2-1 -- Update to upstream 1.8.2 point release -- Require dpkg and koji only on Fedora builds - -* Wed Jan 27 2021 Dodji Seketeli - 1.8.1-1 -- Update to upstream fixes up to libabigail-1.8.1 +* Thu Jan 28 2021 Dodji Seketeli - 1.8.1-1 +- Update to upsteram 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 @@ -189,84 +152,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 - 1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Aug 14 2018 Petr Viktorin - 1.4-2 +- Fix BuildRequires for /usr/bin/python3 +- Resolves: #1615539 -* Tue Dec 1 2020 Dodji Seketeli - 1.8-1 -- Update to upstream 1.8 -- Add 'make check-self-compare' to the regression tests run. -- BuildRequires python3-koji +* Mon Jul 16 2018 Dodji Seketeli - 1.4-1 +- Update to upstream 1.4 version +- Remove disable-runtestdefaultsupprs.py.patch +- Add enable-python-when-no-fedabipkgdiff-is-defined.patch.txt -* Tue Jul 28 2020 Fedora Release Engineering - 1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Wed Jun 20 2018 Dodji Seketeli - 1.3-3 +- Add patch disable-runtestdefaultsupprs.py.patch + This disables the runtestdefaultsupprs.py patch as it's timeouting. + It's running fine locally though. -* Tue Feb 25 2020 Dodji Seketeli - 1.7-1 -- Update to upstream 1.7 - -* Mon Feb 17 2020 Sinny Kumari - 1.6-4 -- Add koji as BuildRequires -- Fixes: RHBZ#1799575 - -* Wed Jan 29 2020 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 27 2019 Dodji Seketeli - 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 - 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 - 1.5-4 -- Remove obsolete requirements for %%post/%%preun scriptlets - -* Fri Feb 01 2019 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 12 2018 Dodji Seketeli - 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 - 1.5-1 -- Update to upstream 1.5 - -* Wed Jul 25 2018 Nils Philippsen - 1.4-2 -- explicitly use Python 3 for fedabipkgdiff - -* Fri Jul 13 2018 Dodji Seketeli - 1.4-1 -- Update to upstream 1.4 -- Merge change to build fedabipkgdiff in Fedora only. - -* Fri Jul 13 2018 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.3-2 -- Rebuilt for Python 3.7 +* Wed Jun 20 2018 Dodji Seketeli - 1.3-2 +- Remove dpkg and koji dependencies * Wed May 16 2018 Dodji Seketeli - 1.3-1 - Update to upstream 1.3 -- Use python3 modules +- Use python3. * Mon Mar 19 2018 Dodji Seketeli - 1.2-2 - Depend on Koji only on Fedora -* Mon Mar 5 2018 Dodji Seketeli - 1.2-1 +* Tue Mar 6 2018 Dodji Seketeli - 1.2-1 - Update to upstream 1.2 * Fri Feb 09 2018 Igor Gnatenko - 1.1-4 @@ -283,7 +195,7 @@ fi - Use python2-sphynx, rpm-python2, python2-rpm rather than python-sphinx, rpm-python. -* Wed Nov 22 2017 Dodji Seketeli - 1.0-1 +* Wed Nov 22 2017 Dodji Seketeli - 1.0-1 - Add missing %%{dist} to release. * Tue Nov 7 2017 Dodji Seketeli - 1.0-1 diff --git a/sources b/sources index 2fbf95e..ba1689a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libabigail-1.8.2.tar.gz) = fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d +SHA512 (libabigail-2.1.tar.gz) = 4fe1d3323f078a76a7529c15a809d0c0d3ac43cabd5ab4bb5c2d03992cbbb61bae3ec858e40796bf9f65029cbc779d258ae4559455178fb95cb8b53bf92bcc9a