From 1438934d49bab873f559c64a4fbaebd59eb11a06 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jul 2020 11:28:55 +0200 Subject: [PATCH] update to 1.7.3 drop patch merged upstream --- .gitignore | 1 + ...1b5c259fa28b4da24cc1c11ab24a31281b64.patch | 126 ------------------ libzip.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 ebe01b5c259fa28b4da24cc1c11ab24a31281b64.patch diff --git a/.gitignore b/.gitignore index 5bfb6be..37bcf2f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ libzip-0.9.3.tar.bz2 /libzip-1.7.0.tar.xz /libzip-1.7.1.tar.xz /libzip-1.7.2.tar.xz +/libzip-1.7.3.tar.xz diff --git a/ebe01b5c259fa28b4da24cc1c11ab24a31281b64.patch b/ebe01b5c259fa28b4da24cc1c11ab24a31281b64.patch deleted file mode 100644 index 088b5a6..0000000 --- a/ebe01b5c259fa28b4da24cc1c11ab24a31281b64.patch +++ /dev/null @@ -1,126 +0,0 @@ -From ebe01b5c259fa28b4da24cc1c11ab24a31281b64 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 13 Jul 2020 08:16:59 +0200 -Subject: [PATCH] restore GNUInstallDirs - ---- - CMakeLists.txt | 17 +++++++++-------- - lib/CMakeLists.txt | 10 +++++----- - man/CMakeLists.txt | 8 ++++---- - 3 files changed, 18 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8013d2ea..b2f81b1c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,7 @@ include(CheckCSourceRuns) - include(CheckCSourceCompiles) - include(CheckStructHasMember) - include(TestBigEndian) -+include(GNUInstallDirs) - if(ENABLE_COMMONCRYPTO) - check_include_files(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND) - else() -@@ -234,7 +235,7 @@ endif(WIN32) - - # rpath handling: use rpath in installed binaries - if(NOT CMAKE_SYSTEM_NAME MATCHES Linux) -- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) -+ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - endif() - -@@ -279,9 +280,9 @@ endif() - # pkgconfig file - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix \${prefix}) --set(bindir \${exec_prefix}/bin) --set(libdir \${exec_prefix}/lib) --set(includedir \${prefix}/include) -+SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) -+SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) -+SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) - if(CMAKE_SYSTEM_NAME MATCHES BSD) - set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") - endif(CMAKE_SYSTEM_NAME MATCHES BSD) -@@ -295,7 +296,7 @@ foreach(LIB ${LIBS_PRIVATE}) - endforeach() - configure_file(libzip.pc.in libzip.pc @ONLY) - if(LIBZIP_DO_INSTALL) -- install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION lib/pkgconfig) -+ install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif() - - # fixed size integral types -@@ -417,7 +418,7 @@ write_basic_package_version_file("${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-v - COMPATIBILITY AnyNewerVersion) - - configure_package_config_file("${PROJECT_NAME}-config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" -- INSTALL_DESTINATION lib/cmake/libzip) -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libzip) - - # Add targets to the build-tree export set - export(TARGETS zip -@@ -427,10 +428,10 @@ export(TARGETS zip - if(LIBZIP_DO_INSTALL) - install(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION include) - install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake -- DESTINATION lib/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) - install(EXPORT ${PROJECT_NAME}-targets NAMESPACE libzip:: FILE ${PROJECT_NAME}-targets.cmake -- DESTINATION lib/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) - endif() - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5a6f1713..082203d0 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -181,11 +181,11 @@ target_include_directories(zip - if(LIBZIP_DO_INSTALL) - install(TARGETS zip - EXPORT ${PROJECT_NAME}-targets -- RUNTIME DESTINATION bin -- ARCHIVE DESTINATION lib -- INCLUDES DESTINATION include -- LIBRARY DESTINATION lib) -- install(FILES zip.h DESTINATION include) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - # create zip_err_str.h from zip.h -diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt -index ce714ec4..90d462a5 100644 ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -104,10 +104,10 @@ foreach(MAN_PAGE ${MAN_PAGES}) - string(REGEX REPLACE "[1-9]$" "${DOCUMENTATION_FORMAT}" SOURCE_FILE ${MAN_PAGE}) - if(LIBZIP_DO_INSTALL) - if (DOCUMENTATION_FORMAT MATCHES "html") -- install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION share/doc/${PROJECT_NAME} RENAME ${SOURCE_FILE}) -+ install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME} RENAME ${SOURCE_FILE}) - else() - string(REGEX REPLACE ".*(.)$" "man\\1" SUBDIR ${MAN_PAGE}) -- install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION man/${SUBDIR}) -+ install(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_MANDIR}/${SUBDIR}) - endif() - endif() - # configure_file does not find out about updates to the sources, and it does not provide a target -@@ -147,9 +147,9 @@ foreach(LINKS_LINE ${MANPAGE_LINKS}) - set(TARGET ${CMAKE_MATCH_2}) - if(LIBZIP_DO_INSTALL) - if (DOCUMENTATION_FORMAT MATCHES "html") -- INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION share/doc/${PROJECT_NAME} RENAME ${TARGET}.html) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME} RENAME ${TARGET}.html) - else() -- INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION man/man3 RENAME ${TARGET}.3) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 RENAME ${TARGET}.3) - endif() - endif() - endif() diff --git a/libzip.spec b/libzip.spec index 490c92a..bafc6f4 100644 --- a/libzip.spec +++ b/libzip.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: libzip -Version: 1.7.2 +Version: 1.7.3 Release: 1%{?dist} Summary: C library for reading, creating, and modifying zip archives @@ -9,8 +9,6 @@ License: BSD URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz -Patch1: https://github.com/nih-at/libzip/commit/ebe01b5c259fa28b4da24cc1c11ab24a31281b64.patch - BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -127,6 +125,10 @@ make check %changelog +* Wed Jul 15 2020 Remi Collet - 1.7.3-1 +- update to 1.7.3 +- drop patch merged upstream + * Mon Jul 13 2020 Remi Collet - 1.7.2-1 - update to 1.7.2 - fix installation layout using merged patch from diff --git a/sources b/sources index 5af66a8..b05fc94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libzip-1.7.2.tar.xz) = 6e598b038deb6800a8f5e713f9cf61bbbebbf80dda5c7020df4a77c9b03cc41f23291712d523fb9721288382f8107170d61a82e2eeb1af5907f1b82526c3a968 +SHA512 (libzip-1.7.3.tar.xz) = 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870