From 343a1577e12805d47eee74e4310f8b34ba0f9899 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 19 Jun 2021 07:41:46 +0200
Subject: update to 1.8.0 enable zstd compression support

---
 libzip.spec | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'libzip.spec')

diff --git a/libzip.spec b/libzip.spec
index f3629c3..f49fbbf 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -11,11 +11,6 @@
 %global libname libzip
 %global soname  5
 %bcond_without  tests
-%if 0%{?rhel} == 6
-%global with_xz 0
-%else
-%global with_xz 1
-%endif
 
 %{?scl:     %scl_package       libzip}
 
@@ -24,8 +19,8 @@ Name:    %{?scl_prefix}%{libname}
 %else
 Name:    %{libname}%{soname}
 %endif
-Version: 1.7.3
-Release: 2%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -36,9 +31,8 @@ BuildRequires:  gcc
 BuildRequires:  zlib-devel >= 1.1.2
 BuildRequires:  bzip2-devel
 BuildRequires:  openssl-devel
-%if %{with_xz}
 BuildRequires:  xz-devel >= 5.2
-%endif
+BuildRequires:  libzstd-devel
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 BuildRequires:  cmake3 >= 3.0.2
 %else
@@ -135,9 +129,6 @@ rm INSTALL.md
 
 # drop skipped test which make test suite fails (cmake issue ?)
 sed -e '/clone-fs-/d' \
-%if ! %{with_xz}
-    -e '/store_to_xz.test/d;/xz_to_store.test/d' \
-%endif
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
     -e '/add_from_stdin/d' \
 %endif
@@ -145,7 +136,7 @@ sed -e '/clone-fs-/d' \
 
 
 %build
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%if 0%{?rhel} == 7
 sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.txt
 %cmake3 \
 %else
@@ -157,27 +148,36 @@ sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.
   -DENABLE_OPENSSL:BOOL=ON \
   -DENABLE_WINDOWS_CRYPTO:BOOL=OFF \
   -DENABLE_BZIP2:BOOL=ON \
-%if %{with_xz}
   -DENABLE_LZMA:BOOL=ON \
-%else
-  -DENABLE_LZMA:BOOL=OFF \
-%endif
+  -DENABLE_ZSTD:BOOL=ON \
   -DBUILD_TOOLS:BOOL=ON \
   -DBUILD_REGRESS:BOOL=ON \
   -DBUILD_EXAMPLES:BOOL=OFF \
   -DBUILD_DOC:BOOL=ON \
   .
 
+%if 0%{?cmake_build:1}
+%cmake_build
+%else
 make %{?_smp_mflags}
+%endif
 
 
 %install
+%if 0%{?cmake_install:1}
+%cmake_install
+%else
 make install DESTDIR=%{buildroot} INSTALL='install -p'
+%endif
 
 
 %check
 %if %{with tests}
+%if 0%{?ctest:1}
+%ctest
+%else
 make check
+%endif
 %else
 : Test suite disabled
 %endif
@@ -213,6 +213,10 @@ make check
 
 
 %changelog
+* Sat Jun 19 2021 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+- enable zstd compression support
+
 * Thu Nov  5 2020 Remi Collet <remi@remirepo.net> - 1.7.3-2
 - adapt for SCL build
 
-- 
cgit