Hello community, here is the log from the commit of package libzip for openSUSE:Factory checked in at 2020-06-22 17:41:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzip (Old) and /work/SRC/openSUSE:Factory/.libzip.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzip" Mon Jun 22 17:41:35 2020 rev:40 rq:814636 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libzip/libzip.changes 2020-06-11 14:43:59.865259407 +0200 +++ /work/SRC/openSUSE:Factory/.libzip.new.2956/libzip.changes 2020-06-22 17:41:41.345035236 +0200 @@ -1,0 +2,10 @@ +Sun Jun 14 06:41:41 UTC 2020 - Andreas Stieger <[email protected]> + +- libzip 1.7.1: + * Restore LIBZIP_VERSION_{MAJOR,MINOR,MICRO} symbols. + * Add LIBZIP_DO_INSTALL build setting to make it easier to use + libzip as subproject +- build with LZMA to support XZ compressed files +- switch to upstream preferred provider of AES support: GnuTLS + +------------------------------------------------------------------- Old: ---- libzip-1.7.0.tar.xz New: ---- libzip-1.7.1.tar.xz libzip-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzip.spec ++++++ --- /var/tmp/diff_new_pack.9BlM8h/_old 2020-06-22 17:41:42.025037419 +0200 +++ /var/tmp/diff_new_pack.9BlM8h/_new 2020-06-22 17:41:42.029037431 +0200 @@ -16,9 +16,10 @@ # +%{!?make_build: %global make_build make %{?_smp_mflags}} %define sover 5 Name: libzip -Version: 1.7.0 +Version: 1.7.1 Release: 0 Summary: C library for reading, creating, and modifying zip archives License: BSD-3-Clause @@ -26,18 +27,20 @@ URL: https://libzip.org/ Source0: https://libzip.org/download/libzip-%{version}.tar.xz Source1: baselibs.conf +Source2: %{name}-rpmlintrc Patch2: pkgconfig.patch -BuildRequires: cmake +BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: groff -BuildRequires: libbz2-devel -BuildRequires: openssl-devel BuildRequires: pkgconfig # for tests BuildRequires: timezone # for tests BuildRequires: unzip -BuildRequires: zlib-devel +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(zlib) >= 1.1.2 Provides: libzip-util = %{version} Obsoletes: libzip-util < %{version} @@ -100,6 +103,7 @@ %postun -n libzip%{sover} -p /sbin/ldconfig %files tools +%license LICENSE %{_bindir}/zipcmp %{_bindir}/zipmerge %{_bindir}/ziptool @@ -112,6 +116,7 @@ %{_libdir}/libzip.so.%{sover}* %files devel +%license LICENSE %doc AUTHORS NEWS.md THANKS %{_libdir}/%{name}.so %{_includedir}/zip.h ++++++ libzip-1.7.0.tar.xz -> libzip-1.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/CMakeLists.txt new/libzip-1.7.1/CMakeLists.txt --- old/libzip-1.7.0/CMakeLists.txt 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/CMakeLists.txt 2020-06-13 12:12:26.000000000 +0200 @@ -3,7 +3,7 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) PROJECT(libzip - VERSION 1.7.0 + VERSION 1.7.1 LANGUAGES C) OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) @@ -61,6 +61,7 @@ ENDIF() OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) +OPTION(LIBZIP_DO_INSTALL "Install libzip and the related files" ON) OPTION(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON) @@ -78,32 +79,34 @@ SET(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}) -ADD_CUSTOM_TARGET(dist - COMMAND git config tar.tar.xz.command "xz -c" - COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.gz HEAD - COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.xz HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) -ADD_CUSTOM_TARGET(distcheck - COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest 2>/dev/null || true - COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest - COMMAND ${CMAKE_COMMAND} -E tar xf ${ARCHIVE_NAME}.tar.gz - COMMAND chmod -R u-w ${ARCHIVE_NAME} - COMMAND mkdir ${ARCHIVE_NAME}-build - COMMAND mkdir ${ARCHIVE_NAME}-dest - COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${ARCHIVE_NAME}-dest ${ARCHIVE_NAME} -B ${ARCHIVE_NAME}-build - COMMAND make -C ${ARCHIVE_NAME}-build -j4 - COMMAND make -C ${ARCHIVE_NAME}-build test - COMMAND make -C ${ARCHIVE_NAME}-build install -# COMMAND make -C ${ARCHIVE_NAME}-build uninstall -# COMMAND if [ `find ${ARCHIVE_NAME}-dest ! -type d | wc -l` -ne 0 ]; then echo leftover files in ${ARCHIVE_NAME}-dest; false; fi - COMMAND make -C ${ARCHIVE_NAME}-build clean - COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest - COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest - COMMAND echo "${ARCHIVE_NAME}.tar.gz is ready for distribution." - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) -ADD_DEPENDENCIES(distcheck dist) +IF(NOT TARGET dist AND NOT TARGET distcheck) + ADD_CUSTOM_TARGET(dist + COMMAND git config tar.tar.xz.command "xz -c" + COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.gz HEAD + COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.xz HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + ADD_CUSTOM_TARGET(distcheck + COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest 2>/dev/null || true + COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest + COMMAND ${CMAKE_COMMAND} -E tar xf ${ARCHIVE_NAME}.tar.gz + COMMAND chmod -R u-w ${ARCHIVE_NAME} + COMMAND mkdir ${ARCHIVE_NAME}-build + COMMAND mkdir ${ARCHIVE_NAME}-dest + COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${ARCHIVE_NAME}-dest ${ARCHIVE_NAME} -B ${ARCHIVE_NAME}-build + COMMAND make -C ${ARCHIVE_NAME}-build -j4 + COMMAND make -C ${ARCHIVE_NAME}-build test + COMMAND make -C ${ARCHIVE_NAME}-build install + # COMMAND make -C ${ARCHIVE_NAME}-build uninstall + # COMMAND if [ `find ${ARCHIVE_NAME}-dest ! -type d | wc -l` -ne 0 ]; then echo leftover files in ${ARCHIVE_NAME}-dest; false; fi + COMMAND make -C ${ARCHIVE_NAME}-build clean + COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest + COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest + COMMAND echo "${ARCHIVE_NAME}.tar.gz is ready for distribution." + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + ADD_DEPENDENCIES(distcheck dist) +ENDIF() #ADD_CUSTOM_TARGET(uninstall # COMMAND cat ${PROJECT_BINARY_DIR}/install_manifest.txt | xargs rm @@ -343,7 +346,9 @@ set(LIBS "${LIBS} -l${LIB}") endforeach() CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY) -INSTALL(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +IF(LIBZIP_DO_INSTALL) + INSTALL(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +ENDIF() # fixed size integral types @@ -474,19 +479,22 @@ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libzip PATH_VARS CMAKE_INSTALL_BINDIR CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR) -INSTALL(EXPORT ${PROJECT_NAME}-targets - FILE ${PROJECT_NAME}-targets.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) +IF(LIBZIP_DO_INSTALL) + INSTALL(EXPORT ${PROJECT_NAME}-targets + FILE ${PROJECT_NAME}-targets.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) +ENDIF() # Add targets to the build-tree export set EXPORT(TARGETS zip FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-targets.cmake") # installation - -INSTALL(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) +IF(LIBZIP_DO_INSTALL) + INSTALL(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/INSTALL.md new/libzip-1.7.1/INSTALL.md --- old/libzip-1.7.0/INSTALL.md 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/INSTALL.md 2020-06-13 12:12:26.000000000 +0200 @@ -42,6 +42,9 @@ - `DOCUMENTATION_FORMAT`: choose one of 'man', 'mdoc', and 'html' for the installed documentation (default: decided by cmake depending on available tools) +- `LIBZIP_DO_INSTALL`: If you include libzip as a subproject, link it + statically and do not want to let it install its files, set this + variable to `OFF`. Defaults to `ON`. If you want to compile with custom `CFLAGS`, set them in the environment before running `cmake`: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/NEWS.md new/libzip-1.7.1/NEWS.md --- old/libzip-1.7.0/NEWS.md 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/NEWS.md 2020-06-13 12:12:26.000000000 +0200 @@ -1,3 +1,11 @@ +1.7.1 [2020-06-13] +================== + +* Restore `LIBZIP_VERSION_{MAJOR,MINOR,MICRO}` symbols. +* Fixes warnings reported by PVS-Studio. +* Add `LIBZIP_DO_INSTALL` build setting to make it easier to use + libzip as subproject. + 1.7.0 [2020-06-05] ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/THANKS new/libzip-1.7.1/THANKS --- old/libzip-1.7.0/THANKS 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/THANKS 2020-06-13 12:12:26.000000000 +0200 @@ -11,6 +11,7 @@ Andrew Brampton <[email protected]> Andrew Molyneux <[email protected]> Ankur Kothari <[email protected]> +Antonin Décimo <[email protected]> BALATON Zoltan <[email protected]> Benjamin Gilbert <[email protected]> Beuc <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/cmake-zipconf.h.in new/libzip-1.7.1/cmake-zipconf.h.in --- old/libzip-1.7.0/cmake-zipconf.h.in 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/cmake-zipconf.h.in 2020-06-13 12:12:26.000000000 +0200 @@ -9,6 +9,9 @@ */ #define LIBZIP_VERSION "${libzip_VERSION}" +#define LIBZIP_VERSION_MAJOR ${libzip_VERSION_MAJOR} +#define LIBZIP_VERSION_MINOR ${libzip_VERSION_MINOR} +#define LIBZIP_VERSION_MICRO ${libzip_VERSION_PATCH} #cmakedefine ZIP_STATIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/lib/CMakeLists.txt new/libzip-1.7.1/lib/CMakeLists.txt --- old/libzip-1.7.0/lib/CMakeLists.txt 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/lib/CMakeLists.txt 2020-06-13 12:12:26.000000000 +0200 @@ -1,6 +1,8 @@ INCLUDE(CheckFunctionExists) -INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +IF(LIBZIP_DO_INSTALL) + INSTALL(FILES zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +ENDIF() SET(CMAKE_C_VISIBILITY_PRESET hidden) @@ -215,9 +217,11 @@ TARGET_LINK_LIBRARIES(zip PRIVATE ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY}) -INSTALL(TARGETS zip - EXPORT ${PROJECT_NAME}-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +IF(LIBZIP_DO_INSTALL) + INSTALL(TARGETS zip + EXPORT ${PROJECT_NAME}-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/lib/zip_dirent.c new/libzip-1.7.1/lib/zip_dirent.c --- old/libzip-1.7.0/lib/zip_dirent.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/lib/zip_dirent.c 2020-06-13 12:12:26.000000000 +0200 @@ -596,7 +596,7 @@ zde->extra_fields = _zip_ef_remove_internal(zde->extra_fields); - return (zip_int64_t)(size + variable_size); + return (zip_int64_t)size + (zip_int64_t)variable_size; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/lib/zip_source_file_stdio_named.c new/libzip-1.7.1/lib/zip_source_file_stdio_named.c --- old/libzip-1.7.0/lib/zip_source_file_stdio_named.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/lib/zip_source_file_stdio_named.c 2020-06-13 12:12:26.000000000 +0200 @@ -206,6 +206,7 @@ if (fstat(fileno(ctx->f), &st) < 0) { zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno); + free(temp); return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/lib/zip_string.c new/libzip-1.7.1/lib/zip_string.c --- old/libzip-1.7.0/lib/zip_string.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/lib/zip_string.c 2020-06-13 12:12:26.000000000 +0200 @@ -145,7 +145,7 @@ return NULL; } - if ((s->raw = (zip_uint8_t *)malloc((size_t)(length + 1))) == NULL) { + if ((s->raw = (zip_uint8_t *)malloc((size_t)length + 1)) == NULL) { free(s); return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/man/CMakeLists.txt new/libzip-1.7.1/man/CMakeLists.txt --- old/libzip-1.7.0/man/CMakeLists.txt 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/man/CMakeLists.txt 2020-06-13 12:12:26.000000000 +0200 @@ -102,11 +102,13 @@ FOREACH(MAN_PAGE ${MAN_PAGES}) STRING(REGEX REPLACE "[1-9]$" "${DOCUMENTATION_FORMAT}" SOURCE_FILE ${MAN_PAGE}) - IF (DOCUMENTATION_FORMAT MATCHES "html") - INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${SOURCE_FILE}) - ELSE() - STRING(REGEX REPLACE ".*(.)$" "man\\1" SUBDIR ${MAN_PAGE}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_MANDIR}/${SUBDIR}) + IF(LIBZIP_DO_INSTALL) + IF (DOCUMENTATION_FORMAT MATCHES "html") + INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${MAN_PAGE} DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${SOURCE_FILE}) + ELSE() + STRING(REGEX REPLACE ".*(.)$" "man\\1" SUBDIR ${MAN_PAGE}) + 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 #CONFIGURE_FILE(${SOURCE_FILE} ${MAN_PAGE} COPYONLY) @@ -143,10 +145,12 @@ IF(${LINKS_LINE} MATCHES "(.*) (.*)") SET(SOURCE ${CMAKE_MATCH_1}) SET(TARGET ${CMAKE_MATCH_2}) - IF (DOCUMENTATION_FORMAT MATCHES "html") - INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${TARGET}.html) - ELSE() - INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 RENAME ${TARGET}.3) + IF(LIBZIP_DO_INSTALL) + IF (DOCUMENTATION_FORMAT MATCHES "html") + INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME ${TARGET}.html) + ELSE() + INSTALL(FILES ${PROJECT_BINARY_DIR}/man/${SOURCE}.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 RENAME ${TARGET}.3) + ENDIF() ENDIF() ENDIF() ENDFOREACH() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/regress/ziptool_regress.c new/libzip-1.7.1/regress/ziptool_regress.c --- old/libzip-1.7.0/regress/ziptool_regress.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/regress/ziptool_regress.c 2020-06-13 12:12:26.000000000 +0200 @@ -110,7 +110,7 @@ idx = strtoull(argv[0], NULL, 10); if (idx >= z_in_count) { - fprintf(stderr, "invalid argument '%" PRIu64 "', only %d zip sources open\n", idx, z_in_count); + fprintf(stderr, "invalid argument '%" PRIu64 "', only %u zip sources open\n", idx, z_in_count); return -1; } if (zip_close(z_in[idx]) < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/src/CMakeLists.txt new/libzip-1.7.1/src/CMakeLists.txt --- old/libzip-1.7.0/src/CMakeLists.txt 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/src/CMakeLists.txt 2020-06-13 12:12:26.000000000 +0200 @@ -7,12 +7,18 @@ ADD_EXECUTABLE(zipcmp zipcmp.c ${SRC_EXTRA_FILES}) TARGET_LINK_LIBRARIES(zipcmp zip ${FTS_LIB} ${ZLIB_LIBRARIES}) -INSTALL(TARGETS zipcmp EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +IF(LIBZIP_DO_INSTALL) + INSTALL(TARGETS zipcmp EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +ENDIF() ADD_EXECUTABLE(zipmerge zipmerge.c ${SRC_EXTRA_FILES}) TARGET_LINK_LIBRARIES(zipmerge zip) -INSTALL(TARGETS zipmerge EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +IF(LIBZIP_DO_INSTALL) + INSTALL(TARGETS zipmerge EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +ENDIF() ADD_EXECUTABLE(ziptool ziptool.c ${SRC_EXTRA_FILES}) TARGET_LINK_LIBRARIES(ziptool zip) -INSTALL(TARGETS ziptool EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +IF(LIBZIP_DO_INSTALL) + INSTALL(TARGETS ziptool EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/src/zipcmp.c new/libzip-1.7.1/src/zipcmp.c --- old/libzip-1.7.0/src/zipcmp.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/src/zipcmp.c 2020-06-13 12:12:26.000000000 +0200 @@ -642,9 +642,9 @@ header_done = 1; } printf("--- %s ", e1->name); - printf("comment %d\n", e1->comment_length); + printf("comment %" PRIu32 "\n", e1->comment_length); printf("+++ %s ", e1->name); - printf("comment %d\n", e2->comment_length); + printf("comment %" PRIu32 "\n", e2->comment_length); } ret = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzip-1.7.0/src/ziptool.c new/libzip-1.7.1/src/ziptool.c --- old/libzip-1.7.0/src/ziptool.c 2020-06-05 12:23:20.000000000 +0200 +++ new/libzip-1.7.1/src/ziptool.c 2020-06-13 12:12:26.000000000 +0200 @@ -396,7 +396,7 @@ static void progress_callback(zip_t *archive, double percentage, void *ud) { - printf("%.1lf%% done\n", percentage * 100); + printf("%.1f%% done\n", percentage * 100); progress_userdata.percentage = percentage; } @@ -480,7 +480,7 @@ method = get_compression_method(argv[1]); flags = (zip_uint32_t)strtoull(argv[2], NULL, 10); if (zip_set_file_compression(za, idx, method, flags) < 0) { - fprintf(stderr, "can't set file compression method at index '%" PRIu64 "' to '%s', flags '%d': %s\n", idx, argv[1], flags, zip_strerror(za)); + fprintf(stderr, "can't set file compression method at index '%" PRIu64 "' to '%s', flags '%" PRIu32 "': %s\n", idx, argv[1], flags, zip_strerror(za)); return -1; } return 0; ++++++ libzip-rpmlintrc ++++++ addFilter("libzip-tools\..* shlib-policy-missing")
