Compare commits

..

No commits in common. "d6b82a9c74c1946a666425a9e28ed9db43b462b4" and "7b8d53c8f3d296a456f1a387ef5ea914ef017b59" have entirely different histories.

6 changed files with 5 additions and 81 deletions

View File

@ -1,29 +0,0 @@
From 0c955aa208411eac10a067c72ce2e642697fd533 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Sat, 19 Jun 2021 19:24:43 +0200
Subject: [PATCH] Return false instead of -1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Noted by Rafał Mikrut in #245
---
lib/zip_source_file_win32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/zip_source_file_win32.c b/lib/zip_source_file_win32.c
index 6547fc20..0dea2c11 100644
--- a/lib/zip_source_file_win32.c
+++ b/lib/zip_source_file_win32.c
@@ -115,7 +115,7 @@ _zip_win32_op_seek(zip_source_file_context_t *ctx, void *f, zip_int64_t offset,
break;
default:
zip_error_set(&ctx->error, ZIP_ER_SEEK, EINVAL);
- return -1;
+ return false;
}
li.QuadPart = (LONGLONG)offset;
--
2.36.1

View File

@ -1,26 +0,0 @@
From e7bfb68e99905991cee97793d49d2acbc00829fa Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Sun, 18 Jul 2021 22:33:06 +0200
Subject: [PATCH] fix install destination of executables for iOS/tvOS/watchOS
see https://cmake.org/cmake/help/latest/policy/CMP0006.html
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d75b8a0..a0f53252 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ foreach(PROGRAM zipcmp zipmerge ziptool)
target_link_libraries(${PROGRAM} zip)
target_include_directories(${PROGRAM} PRIVATE BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
if(LIBZIP_DO_INSTALL)
- install(TARGETS ${PROGRAM} EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION bin)
+ install(TARGETS ${PROGRAM} EXPORT ${PROJECT_NAME}-targets DESTINATION bin)
endif()
if(NOT HAVE_GETOPT)
target_sources(${PROGRAM} PRIVATE getopt.c)
--
2.33.0

BIN
libzip-1.5.1.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,15 +1,12 @@
Name: libzip
Version: 1.8.0
Release: 4
Version: 1.5.1
Release: 3
Summary: A C library for reading, creating, and modifying zip archives
License: BSD
URL: https://libzip.org/
Source0: https://libzip.org/download/libzip-%{version}.tar.xz
Patch6000: backport-Return-false-instead-of-1.patch
Patch6001: backport-fix-install-destination-of-executables-for-iOS-tvOS-.patch
BuildRequires: gcc zlib-devel bzip2-devel openssl-devel cmake
BuildRequires: gcc zlib-devel bzip2-devel openssl-devel cmake
BuildRequires: perl-interpreter perl(Cwd) perl(File::Copy) perl(File::Path) perl(Getopt::Long)
BuildRequires: perl(IPC::Open3) perl(Storable) perl(Symbol) perl(UNIVERSAL) perl(strict) perl(warnings)
@ -55,11 +52,6 @@ make test
%license LICENSE
%{_bindir}/zip*
%{_libdir}/libzip.so.5*
%{_libdir}/cmake/libzip/libzip-config-version.cmake
%{_libdir}/cmake/libzip/libzip-config.cmake
%{_libdir}/cmake/libzip/libzip-targets-noconfig.cmake
%{_libdir}/cmake/libzip/libzip-targets.cmake
%files devel
%defattr(-,root,root)
@ -73,19 +65,6 @@ make test
%{_mandir}/man1/*1*
%{_mandir}/man3/*3*
%changelog
* Tue Aug 1 2023 Bolehu <heyaohua@xfusion.com> - 1.8.0-4
- fix install destination of executables for iOS/tvOS/watchOS
* Mon Jul 31 2023 Bolehu <heyaohua@xfusion.com> - 1.8.0-3
- Return false instead of -1
* Thu Apr 21 2022 Yangping <yangping69@h-partners.com> -1.8.0-2
- remove 1.5.1.tar.gz
* Thu Jan 13 2022 Yangping <yangping69@huawei.com> - 1.8.0-1
- Update to 1.8.0
* Tue Nov 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.5.1-3
- Package init

View File

@ -1,4 +1,4 @@
version_control: github
src_repo: nih-at/libzip
tag_prefix: ^(rel-|v)
seperator: "-"
tag_prefix: rel-
seperator: -