From 8b4b099406938a6bb813ddb95b002fe3edb1e5f5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 12 Mar 2018 10:42:47 +0100
Subject: update to 1.5.0 use openssl for cryptography instead of bundled
 custom AES implementation

---
 libzip.spec | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'libzip.spec')

diff --git a/libzip.spec b/libzip.spec
index 49fefb6..1724642 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -12,13 +12,13 @@
 %global soname  5
 %global with_tests     0%{!?_without_tests:1}
 
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 Name:    %{libname}
 %else
 Name:    %{libname}%{soname}
 %endif
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -27,14 +27,11 @@ Source0: https://libzip.org/download/libzip-%{version}.tar.xz
 
 # drop RPATH from installed binaries
 Patch0:  libzip-rpath.patch
-# allow path customization (lib64)
-Patch1:  libzip-upstream.patch
-# fix multi-lib issue
-Patch2:  libzip-multilib.patch
 
 BuildRequires:  gcc
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
+BuildRequires:  openssl-devel
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 BuildRequires:  cmake3 >= 3.0.2
 %else
@@ -114,9 +111,7 @@ The %{name}-tools package provides command line tools split off %{name}:
 
 %prep
 %setup -q -n %{libname}-%{version}
-%patch1 -p1 -b .upstream
 %patch0 -p1 -b .rpm
-%patch2 -p1 -b .multilib
 
 # unwanted in package documentation
 rm INSTALL.md
@@ -126,6 +121,7 @@ rm INSTALL.md
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 # drop skipped test which make test suite fails (cmake issue ?)
 sed -e '/clone-fs-/d' -i regress/CMakeLists.txt
+sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.txt
 %cmake3 .
 %else
 %cmake .
@@ -176,6 +172,10 @@ make check
 
 
 %changelog
+* Mon Mar 12 2018 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+- use openssl for cryptography instead of bundled custom AES implementation
+
 * Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 1.4.0-5
 - missing BR on C compiler
 - drop ldconfig scriptlets (F28+)
-- 
cgit