From 634bd2d78074684ff61c194c41af71420939ff52 Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Thu, 22 Jul 2021 16:32:56 +0200
Subject: [PATCH] Fix multilib conflicts in hte devel package.

Resolves: rhbz#1915747
---
 multilib-32.patch              | 29 +++++++++++++++++++++++++++++
 multilib-64.patch              | 29 +++++++++++++++++++++++++++++
 zziplib-0.13.69-multilib.patch | 31 -------------------------------
 zziplib.spec                   | 16 +++++++++++++---
 4 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 multilib-32.patch
 create mode 100644 multilib-64.patch
 delete mode 100644 zziplib-0.13.69-multilib.patch

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 4f099fc..2ea08c6 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -5,7 +5,8 @@ Release: 4%{?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 +74,14 @@ 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 +108,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jul 22 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-5
+- Refresh the multilib patch
+Resolves: rhbz#1915747
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.71-4
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937