The package rpms/zziplib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/zziplib.git/commit/?id=5e2d0297ea....
Change:
+%ifarch i686 armv7hl
Thanks.
Full change:
============
commit 5e2d0297ea68d9c24d8278bdafa0cbb0ce099b7d
Author: Jakub Martisko <jamartis(a)redhat.com>
Date: Wed Sep 1 19:42:55 2021 +0200
Sync the multilib patches with rhel
Resolves: rhbz#1988061
diff --git a/multilib-32.patch b/multilib-32.patch
new file mode 100644
index 0000000..ae99a59
--- /dev/null
+++ b/multilib-32.patch
@@ -0,0 +1,29 @@
+--- ./a/zzip/_config.h 2021-07-21 14:18:09.000000000 +0200
++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200
+@@ -138,9 +138,12 @@
+
+ /* whether the system defaults to 32bit off_t but can do 64bit when requested
+ */
++#if __WORDSIZE == 32
+ #ifndef ZZIP_LARGEFILE_SENSITIVE
+ #define ZZIP_LARGEFILE_SENSITIVE 1
+ #endif
++#endif
++/* #undef LARGEFILE_SENSITIVE */
+
+ /* Define to the sub-directory where libtool stores uninstalled libraries. */
+ #ifndef ZZIP_LT_OBJDIR
+@@ -227,9 +230,13 @@
+ #endif
+
+ /* Number of bits in a file offset, on hosts where this is settable. */
++#if __WORDSIZE == 32
+ #ifndef ZZIP__FILE_OFFSET_BITS
+ #define ZZIP__FILE_OFFSET_BITS 64
+ #endif
++#endif
++/* #undef _FILE_OFFSET_BITS */
++
+
+ /* Define for large files, on AIX-style hosts. */
+ /* #undef _LARGE_FILES */
diff --git a/multilib-64.patch b/multilib-64.patch
new file mode 100644
index 0000000..5285e3a
--- /dev/null
+++ b/multilib-64.patch
@@ -0,0 +1,29 @@
+--- ./a/zzip/_config.h 2021-07-21 14:18:14.000000000 +0200
++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200
+@@ -138,6 +138,11 @@
+
+ /* whether the system defaults to 32bit off_t but can do 64bit when requested
+ */
++#if __WORDSIZE == 32
++#ifndef ZZIP_LARGEFILE_SENSITIVE
++#define ZZIP_LARGEFILE_SENSITIVE 1
++#endif
++#endif
+ /* #undef LARGEFILE_SENSITIVE */
+
+ /* Define to the sub-directory where libtool stores uninstalled libraries. */
+@@ -225,8 +230,14 @@
+ #endif
+
+ /* Number of bits in a file offset, on hosts where this is settable. */
++#if __WORDSIZE == 32
++#ifndef ZZIP__FILE_OFFSET_BITS
++#define ZZIP__FILE_OFFSET_BITS 64
++#endif
++#endif
+ /* #undef _FILE_OFFSET_BITS */
+
++
+ /* Define for large files, on AIX-style hosts. */
+ /* #undef _LARGE_FILES */
+
diff --git a/zziplib-0.13.69-multilib.patch b/zziplib-0.13.69-multilib.patch
deleted file mode 100644
index 24cf64b..0000000
--- a/zziplib-0.13.69-multilib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h
---- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300
-+++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300
-@@ -139,6 +139,11 @@
- /* whether the system defaults to 32bit off_t but can do 64bit when requested
- */
- /* #undef LARGEFILE_SENSITIVE */
-+#if __WORDSIZE == 32
-+#ifndef ZZIP_LARGEFILE_SENSITIVE
-+#define ZZIP_LARGEFILE_SENSITIVE 1
-+#endif
-+#endif
-
- /* Define to the sub-directory where libtool stores uninstalled libraries. */
- #ifndef ZZIP_LT_OBJDIR
-@@ -197,6 +202,15 @@
- /* The number of bytes in type short */
- /* #undef SIZEOF_SHORT */
-
-+/* The number of bytes in type long */
-+#ifndef ZZIP_SIZEOF_LONG
-+#if __WORDSIZE == 32
-+#define ZZIP_SIZEOF_LONG 4
-+#elif __WORDSIZE == 64
-+#define ZZIP_SIZEOF_LONG 8
-+#endif
-+#endif
-+
- /* Define to 1 if you have the ANSI C header files. */
- #ifndef ZZIP_STDC_HEADERS
- #define ZZIP_STDC_HEADERS 1
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
+
+pushd %{_builddir}/zziplib-%{version}
+%ifarch i686 armv7hl
+ patch -p2 < %{PATCH100}
+%endif
%ifnarch i686 armv7hl
-%apply_patch %{PATCH0} -p2
+ 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 <jamartis(a)redhat.com> - 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 <releng(a)fedoraproject.org> -
0.13.71-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild