From 15d64852ebc5a8a1b46d1f00553c7136c88063c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Apr 2018 11:06:53 +0200 Subject: [PATCH] update to 1.5.1 drop dependency on zlib-devel and bzip2-devel no more referenced in libzip.pc drop rpath patch merged upstream --- .gitignore | 1 + libzip-rpath.patch | 13 ------------- libzip.spec | 16 ++++++++-------- sources | 3 +-- 4 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 libzip-rpath.patch diff --git a/.gitignore b/.gitignore index 4610e91..e94abde 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libzip-0.9.3.tar.bz2 /libzip-1.3.2.tar.xz /libzip-1.4.0.tar.xz /libzip-1.5.0.tar.xz +/libzip-1.5.1.tar.xz diff --git a/libzip-rpath.patch b/libzip-rpath.patch deleted file mode 100644 index bc5e2da..0000000 --- a/libzip-rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up ./CMakeLists.txt.rpm ./CMakeLists.txt ---- ./CMakeLists.txt.rpm 2017-12-30 07:46:53.988134130 +0100 -+++ ./CMakeLists.txt 2017-12-30 07:47:03.787185954 +0100 -@@ -139,9 +139,6 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsP - - ADD_DEFINITIONS("-DHAVE_CONFIG_H") - --# rpath handling: use rpath in installed binaries --SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") --SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - # Testing - ENABLE_TESTING() diff --git a/libzip.spec b/libzip.spec index 96198c1..1531e82 100644 --- a/libzip.spec +++ b/libzip.spec @@ -1,17 +1,14 @@ %global with_tests 0%{!?_without_tests:1} Name: libzip -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives License: BSD URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz -# drop RPATH from installed binaries -Patch1: libzip-rpath.patch - BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -43,9 +40,6 @@ The API is documented by man pages. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -# referenced in libzip.pc -Requires: zlib-devel%{?_isa} -Requires: bzip2-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -113,6 +107,12 @@ make check %changelog +* Wed Apr 11 2018 Remi Collet - 1.5.1-1 +- update to 1.5.1 +- drop dependency on zlib-devel and bzip2-devel no more + referenced in libzip.pc +- drop rpath patch merged upstream + * Thu Mar 15 2018 Remi Collet - 1.5.0-2 - add dependency on zlib-devel and bzip2-devel #1556068 diff --git a/sources b/sources index 718ccb9..490a3ab 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (libzip-1.4.0.tar.xz) = 125e4de8b02781023f9bed450747b9c36942cbf41de7a863402786d1c7b848e19b425f4b0c26ab3857c6bbfd8571bcd9cb1434df355c59148db54f1b951f5c56 -SHA512 (libzip-1.5.0.tar.xz) = 6854c0cc40cbff4fe2efc407b3a52019a234ff734fccfc5068117e29541232827f5100b74fdf68537e5ba7165b41b14312fe934aebe388372e1d6face2185ef1 +SHA512 (libzip-1.5.1.tar.xz) = 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d