diff --git a/zziplib.spec b/zziplib.spec index 2fc3e42..59447ce 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,11 +1,14 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch0: zziplib-0.13.69-multilib.patch + + +Patch100: multilib-32.patch +Patch101: multilib-64.patch BuildRequires: make BuildRequires: gcc @@ -73,9 +76,16 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Only patch generated _config.h on non-i686 and armv7hl # These platforms have a correct _config.h already -%ifnarch i686 armv7hl -%apply_patch %{PATCH0} -p2 + +pushd %{_builddir}/zziplib-%{version} +%ifarch i686 armv7hl + patch -p2 < %{PATCH100} %endif +%ifnarch i686 armv7hl + patch -p2 < %{PATCH101} +%endif +popd + %make_build @@ -102,6 +112,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_mandir}/man3/* %changelog +* Wed Sep 01 2021 Jakub Martisko - 0.13.71-5 +- Use the multilib patches from RHEL +- Resolves ftbfs +Resolves: rhbz#1988061 +Related: rhbz#1915747 + * Fri Jul 23 2021 Fedora Release Engineering - 0.13.71-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild