summaryrefslogtreecommitdiffstats
path: root/libzip.spec
diff options
context:
space:
mode:
Diffstat (limited to 'libzip.spec')
-rw-r--r--libzip.spec19
1 files changed, 16 insertions, 3 deletions
diff --git a/libzip.spec b/libzip.spec
index cc73848..b81a011 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -14,7 +14,7 @@
%if 0%{?rhel} == 6
%global with_xz 0
%else
-%global with_xz 0
+%global with_xz 1
%endif
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -22,7 +22,7 @@ Name: %{libname}
%else
Name: %{libname}%{soname}
%endif
-Version: 1.6.1
+Version: 1.7.0
Release: 1%{?dist}
Summary: C library for reading, creating, and modifying zip archives
@@ -30,6 +30,9 @@ License: BSD
URL: https://libzip.org/
Source0: https://libzip.org/download/libzip-%{version}.tar.xz
+Patch0: 0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch
+Patch1: 0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch
+
BuildRequires: gcc
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
@@ -116,6 +119,8 @@ The %{name}-tools package provides command line tools split off %{name}:
%prep
%setup -q -n %{libname}-%{version}
+%patch0 -p1
+%patch1 -p1
# unwanted in package documentation
rm INSTALL.md
@@ -128,7 +133,9 @@ sed -e '/store_to_xz.test/d;/xz_to_store.test/d' -i regress/CMakeLists.txt
%build
%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 '/clone-fs-/d' \
+ -e '/add_from_stdin/d' \
+ -i regress/CMakeLists.txt
sed -e 's/COMMAND cmake /COMMAND cmake3 /' -i CMakeLists.txt regress/CMakeLists.txt
%cmake3 \
%else
@@ -189,12 +196,18 @@ make check
%{_includedir}/zipconf*.h
%{_libdir}/libzip.so
%{_libdir}/pkgconfig/libzip.pc
+%{_libdir}/cmake/libzip
%{_mandir}/man3/libzip*
%{_mandir}/man3/zip*
%{_mandir}/man3/ZIP*
%changelog
+* Fri Jun 5 2020 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- update to 1.7.0
+- really enable lzma support (excepted on EL-6)
+- patch zipconf.h to re-add missing LIBZIP_VERSION_* macros
+
* Mon Feb 3 2020 Remi Collet <remi@remirepo.net> - 1.6.1-1
- update to 1.6.1