From 94a4bd1e886420bb108c4db3e540017efa2f83cf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Feb 2017 09:00:28 +0100 Subject: [PATCH] update to 1.2.0 soname bump to 5 temporarily keep libzip.so.4 --- .gitignore | 1 + libzip.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c3589e..4d13c46 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libzip-0.9.3.tar.bz2 /libzip-1.1.1.tar.xz /libzip-1.1.2.tar.xz /libzip-1.1.3.tar.xz +/libzip-1.2.0.tar.xz diff --git a/libzip.spec b/libzip.spec index 3ce9632..f25efe2 100644 --- a/libzip.spec +++ b/libzip.spec @@ -2,8 +2,8 @@ %global with_tests 0%{!?_without_tests:1} Name: libzip -Version: 1.1.3 -Release: 2%{?dist} +Version: 1.2.0 +Release: 0%{?dist} Summary: C library for reading, creating, and modifying zip archives License: BSD @@ -12,6 +12,9 @@ Source0: http://www.nih.at/libzip/libzip-%{version}.tar.xz # to handle multiarch headers, ex from mysql-devel package Source1: zipconf.h +# specific AES crypto for WinZip compatibility +Provides: bundled(gladman-fcrypt) + BuildRequires: zlib-devel # Needed to run the test suite # find regress/ -type f | /usr/lib/rpm/perl.req @@ -26,6 +29,8 @@ BuildRequires: perl(Symbol) BuildRequires: perl(UNIVERSAL) BuildRequires: perl(strict) BuildRequires: perl(warnings) +# TODO remove this - Hack to not break buildroot +BuildRequires: libzip %description @@ -90,6 +95,9 @@ ln -s ../%{_lib}/libzip/include/zipconf.h \ %{buildroot}%{_includedir}/zipconf.h %endif +# TODO remove this - Hack to not break buildroot +cp -p %{_libdir}/libzip.so.4.0.0 %{buildroot}%{_libdir} +ln -s libzip.so.4.0.0 %{buildroot}%{_libdir}/libzip.so.4 %check %if %{with_tests} @@ -105,6 +113,8 @@ make check %files %license LICENSE +%{_libdir}/libzip.so.5* +# TODO remove this - Hack to not break buildroot %{_libdir}/libzip.so.4* %files tools @@ -127,6 +137,11 @@ make check %changelog +* Tue Feb 28 2017 Remi Collet - 1.2.0-0 +- update to 1.2.0 +- soname bump to 5 +- temporarily keep libzip.so.4 + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 23bea5f..49a4e6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7196e2fbae93d7e1f843aedee9bdf40 libzip-1.1.3.tar.xz +SHA512 (libzip-1.2.0.tar.xz) = 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b