From 9db7c0ca16dd7e6d91519517e0f1051ccb762ea6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 20 Nov 2017 14:53:42 +0100
Subject: [PATCH] update to 1.3.2 drop multilib header hack change URL to
 https://libzip.org/ test suite now ok on all arch

---
 .gitignore  |  1 +
 libzip.spec | 28 ++++++++++------------------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ee4e15..fbd8cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ libzip-0.9.3.tar.bz2
 /libzip-1.1.3.tar.xz
 /libzip-1.2.0.tar.xz
 /libzip-1.3.0.tar.xz
+/libzip-1.3.2.tar.xz
diff --git a/libzip.spec b/libzip.spec
index 469f4a9..855ac2f 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -1,13 +1,13 @@
 %global with_tests     0%{!?_without_tests:1}
 
 Name:    libzip
-Version: 1.3.0
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
-URL:     http://www.nih.at/libzip/index.html
-Source0: http://www.nih.at/libzip/libzip-%{version}.tar.xz
+URL:     https://libzip.org/
+Source0: https://libzip.org/download/libzip-%{version}.tar.xz
 
 # specific AES crypto for WinZip compatibility
 Provides: bundled(gladman-fcrypt)
@@ -28,7 +28,6 @@ BuildRequires:  perl(Symbol)
 BuildRequires:  perl(UNIVERSAL)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
-BuildRequires:  multilib-rpm-config
 
 
 %description
@@ -76,25 +75,14 @@ make %{?_smp_mflags}
 
 
 %install
-
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 ## unpackaged files
 rm -fv %{buildroot}%{_libdir}/lib*.la
 
-## FIXME: someday fix consumers of libzip to properly handle
-## header @ %%{_libdir}/libzip/include/zipconf.h -- rex
-ln -s ../%{_lib}/libzip/include/zipconf.h \
-      %{buildroot}%{_includedir}/zipconf.h
-%multilib_fix_c_header --file %{_includedir}/zipconf.h
-
 
 %check
 %if %{with_tests}
-if [ %{__isa_bits} -lt 64 ]; then
-  export XFAIL_TESTS="encryption-nonrandom-aes128.test encryption-nonrandom-aes192.test encryption-nonrandom-aes256.test"
-fi
-
 make check
 %else
 : Test suite disabled
@@ -119,8 +107,6 @@ make check
 %doc API-CHANGES AUTHORS THANKS *.md
 %{_includedir}/zip.h
 %{_includedir}/zipconf*.h
-%dir %{_libdir}/libzip
-%{_libdir}/libzip/include
 %{_libdir}/libzip.so
 %{_libdir}/pkgconfig/libzip.pc
 %{_mandir}/man3/libzip*
@@ -129,6 +115,12 @@ make check
 
 
 %changelog
+* Mon Nov 20 2017 Remi Collet <remi@remirepo.net> - 1.3.2-1
+- update to 1.3.2
+- drop multilib header hack
+- change URL to https://libzip.org/
+- test suite now ok on all arch
+
 * Wed Sep 06 2017 Pavel Raiskup <praiskup@redhat.com> - 1.3.0-2
 - use multilib-rpm-config for multilib hacks
 
diff --git a/sources b/sources
index 09b066b..28dc1ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libzip-1.3.0.tar.xz) = 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
+SHA512 (libzip-1.3.2.tar.xz) = d7b678c4a39f7bc33f90febac1b42230eac4d414e835dab7d3458a81f047482cee9ee65b6374bdf8abbf5a33c23725e8771da51300ba92ddc6728b570caec255