From f45d5db04212594fb25cbbbbdbaedaa203bd264d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Aug 2018 13:30:50 +0000 Subject: [PATCH 01/43] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..ca25a41 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# minizip + +The minizip package \ No newline at end of file From 1cd561bf9d54991b21dfdb7118c0cd9dcae9ae01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 29 Aug 2018 15:36:56 +0200 Subject: [PATCH 02/43] Initial import (#1615381) --- .gitignore | 1 + minizip-2.5.0-1_system-bzip2-linking.patch | 59 +++++++++++++++++++ minizip.spec | 66 ++++++++++++++++++++++ sources | 1 + 4 files changed, 127 insertions(+) create mode 100644 .gitignore create mode 100644 minizip-2.5.0-1_system-bzip2-linking.patch create mode 100644 minizip.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2ef15b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/minizip-2.5.0.tar.gz diff --git a/minizip-2.5.0-1_system-bzip2-linking.patch b/minizip-2.5.0-1_system-bzip2-linking.patch new file mode 100644 index 0000000..dd96584 --- /dev/null +++ b/minizip-2.5.0-1_system-bzip2-linking.patch @@ -0,0 +1,59 @@ +From 01bc6016fb86e6aa5b714752b7e18d6a3c96eca4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= +Date: Fri, 17 Aug 2018 10:38:13 +0200 +Subject: [PATCH] use system Bzip2 library if available + +--- + CMakeLists.txt | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11f35dd..c6606b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,6 +45,16 @@ if(USE_ZLIB) + add_definitions(-DHAVE_ZLIB) + endif() + ++# Check if bzip2 installation is present ++if(USE_BZIP2) ++ set(BZIP2_ROOT ${DEF_BZIP2_ROOT} CACHE PATH "Parent directory of bzip2 installation") ++ find_package(BZip2) ++ if(BZIP2_FOUND) ++ include_directories(${BZIP2_INCLUDE_DIRS}) ++ endif() ++ add_definitions(-DHAVE_BZIP2) ++endif() ++ + set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONLY) + +@@ -202,7 +212,14 @@ if(USE_ZLIB) + endif() + endif() + +-if(USE_BZIP2) ++if(USE_BZIP2 AND BZIP2_FOUND) ++ add_definitions(-DHAVE_BZIP2) ++ ++ list(APPEND MINIZIP_SRC "mz_strm_bzip.c") ++ list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_bzip.h") ++ ++ set(CMAKE_REQUIRED_LIBRARIES BZip2::BZip2) ++elseif(USE_BZIP2) + add_definitions(-DHAVE_BZIP2) + add_definitions(-DBZ_NO_STDIO) + +@@ -370,6 +387,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C PREFIX "" + if(USE_ZLIB) + target_link_libraries(${PROJECT_NAME} ZLIB::ZLIB) + endif() ++if(USE_BZIP2 AND BZIP2_FOUND) ++ target_link_libraries(${PROJECT_NAME} BZip2::BZip2) ++endif() + if(USE_LZMA) + set_target_properties(${PROJECT_NAME} PROPERTIES C_STANDARD 99) + endif() +-- +2.17.1 + diff --git a/minizip.spec b/minizip.spec new file mode 100644 index 0000000..ec731ea --- /dev/null +++ b/minizip.spec @@ -0,0 +1,66 @@ +Name: minizip +Version: 2.5.0 +Release: 1%{?dist} +Summary: Minizip contrib in zlib with the latest bug fixes and advanced features + +License: zlib +URL: https://github.com/nmoinvaz/%{name} +Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + +# https://github.com/nmoinvaz/minizip/pull/297 +Patch0: minizip-2.5.0-1_system-bzip2-linking.patch +BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel + + +%description +Minizip zlib contribution that includes: +* AES encryption +* I/O buffering +* PKWARE disk splitting +It also has the latest bug fixes that having been found all over the internet. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: cmake zlib-devel + + +%description devel +Development files for %{name} library. + + +%prep +%autosetup +rm -rf lib/bzip2 + + +%build +%cmake . +make %{?_smp_mflags} + +%install +%make_install + + +%ldconfig_scriptlets + + +%files +%license LICENSE +%doc README.md +%{_libdir}/lib%{name}.so.* + + +%files devel +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name} +%{_includedir}/mz*.h + +%changelog +* Thu Aug 16 2018 Patrik Novotný 2.5.0-1 +- Version update. Build againts system bzip2. + +* Thu Aug 9 2018 Patrik Novotný 2.3.9-1 +- Initial build diff --git a/sources b/sources new file mode 100644 index 0000000..4fc01a7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (minizip-2.5.0.tar.gz) = 321d88754159c982650966b14be8e9d47eb64fc692ea699f5890fe5bf27576899aaa7f750cce77d59cd17b5bd365cdf75dc43f21c11b9330568a806f898171c6 From cafd23520610befa4cb4815268262e8160df44f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 30 Aug 2018 12:38:10 +0200 Subject: [PATCH 03/43] Provide bundled AES and SHA1 libraries --- minizip.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/minizip.spec b/minizip.spec index ec731ea..138b67b 100644 --- a/minizip.spec +++ b/minizip.spec @@ -10,6 +10,8 @@ Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-% # https://github.com/nmoinvaz/minizip/pull/297 Patch0: minizip-2.5.0-1_system-bzip2-linking.patch BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel +Provides: bundled(aes-gladman) +Provides: bundled(sha1-gladman) %description @@ -59,6 +61,9 @@ make %{?_smp_mflags} %{_includedir}/mz*.h %changelog +* Thu Aug 30 2018 Patrik Novotný 2.5.0-1 - Version update. Build againts system bzip2. From c93f1b4cf8004b5f5b0a98828ac1546ff8b7cfcf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 7 Oct 2018 13:03:52 -0600 Subject: [PATCH 04/43] Update to 2.5.4 --- .gitignore | 1 + minizip-2.5.0-1_system-bzip2-linking.patch | 59 ---------------------- minizip.spec | 11 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 minizip-2.5.0-1_system-bzip2-linking.patch diff --git a/.gitignore b/.gitignore index 2ef15b6..3c38fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /minizip-2.5.0.tar.gz +/minizip-2.5.4.tar.gz diff --git a/minizip-2.5.0-1_system-bzip2-linking.patch b/minizip-2.5.0-1_system-bzip2-linking.patch deleted file mode 100644 index dd96584..0000000 --- a/minizip-2.5.0-1_system-bzip2-linking.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 01bc6016fb86e6aa5b714752b7e18d6a3c96eca4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= -Date: Fri, 17 Aug 2018 10:38:13 +0200 -Subject: [PATCH] use system Bzip2 library if available - ---- - CMakeLists.txt | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11f35dd..c6606b6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,6 +45,16 @@ if(USE_ZLIB) - add_definitions(-DHAVE_ZLIB) - endif() - -+# Check if bzip2 installation is present -+if(USE_BZIP2) -+ set(BZIP2_ROOT ${DEF_BZIP2_ROOT} CACHE PATH "Parent directory of bzip2 installation") -+ find_package(BZip2) -+ if(BZIP2_FOUND) -+ include_directories(${BZIP2_INCLUDE_DIRS}) -+ endif() -+ add_definitions(-DHAVE_BZIP2) -+endif() -+ - set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONLY) - -@@ -202,7 +212,14 @@ if(USE_ZLIB) - endif() - endif() - --if(USE_BZIP2) -+if(USE_BZIP2 AND BZIP2_FOUND) -+ add_definitions(-DHAVE_BZIP2) -+ -+ list(APPEND MINIZIP_SRC "mz_strm_bzip.c") -+ list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_bzip.h") -+ -+ set(CMAKE_REQUIRED_LIBRARIES BZip2::BZip2) -+elseif(USE_BZIP2) - add_definitions(-DHAVE_BZIP2) - add_definitions(-DBZ_NO_STDIO) - -@@ -370,6 +387,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C PREFIX "" - if(USE_ZLIB) - target_link_libraries(${PROJECT_NAME} ZLIB::ZLIB) - endif() -+if(USE_BZIP2 AND BZIP2_FOUND) -+ target_link_libraries(${PROJECT_NAME} BZip2::BZip2) -+endif() - if(USE_LZMA) - set_target_properties(${PROJECT_NAME} PROPERTIES C_STANDARD 99) - endif() --- -2.17.1 - diff --git a/minizip.spec b/minizip.spec index 138b67b..ec92e25 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.5.0 +Version: 2.5.4 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -7,8 +7,6 @@ License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/nmoinvaz/minizip/pull/297 -Patch0: minizip-2.5.0-1_system-bzip2-linking.patch BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -39,7 +37,7 @@ rm -rf lib/bzip2 %build %cmake . -make %{?_smp_mflags} +%make_build %install %make_install @@ -61,7 +59,10 @@ make %{?_smp_mflags} %{_includedir}/mz*.h %changelog -* Thu Aug 30 2018 Patrik Novotný 2.5.4-1 +- Update to 2.5.4 + +* Thu Aug 30 2018 Patrik Novotný 2.5.0-2 - Provide bundled AES and SHA1 libraries * Thu Aug 16 2018 Patrik Novotný 2.5.0-1 diff --git a/sources b/sources index 4fc01a7..5fa2a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.5.0.tar.gz) = 321d88754159c982650966b14be8e9d47eb64fc692ea699f5890fe5bf27576899aaa7f750cce77d59cd17b5bd365cdf75dc43f21c11b9330568a806f898171c6 +SHA512 (minizip-2.5.4.tar.gz) = 5125ed603ae550b375e9af0d9c885144e1a02dfbf33582dbb158b34643d633f3f2cda1f8359b79864d9ec5ee933435279d326d16ccfa193937281ccf4d6a192c From d1d00fc60c5e40a3244b143996c1e5580291f9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 28 Nov 2018 13:51:53 +0100 Subject: [PATCH 05/43] Update to upstream release 2.8.0 --- minizip.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/minizip.spec b/minizip.spec index ec92e25..14afad5 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.5.4 +Version: 2.8.0 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -57,8 +57,13 @@ rm -rf lib/bzip2 %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name} %{_includedir}/mz*.h +%{_includedir}/unzip.h +%{_includedir}/zip.h %changelog +* Wed Nov 28 2018 Patrik Novotný 2.8.0-1 +- Update to upstream version 2.8.0 + * Sun Oct 7 2018 Orion Poplawski 2.5.4-1 - Update to 2.5.4 diff --git a/sources b/sources index 5fa2a99..73f811e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.5.4.tar.gz) = 5125ed603ae550b375e9af0d9c885144e1a02dfbf33582dbb158b34643d633f3f2cda1f8359b79864d9ec5ee933435279d326d16ccfa193937281ccf4d6a192c +SHA512 (minizip-2.8.0.tar.gz) = c6d46071cbe393dd3c9df2f414cc553b4a3595956dc9cf6d4130d61d880e87d11e1e763860aecbc949ee3152857fd28aa98e4d92ddbee89ef8645916f7658aed From 96592c696e475168bdc96eaeade10c1a9d9e9b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 28 Nov 2018 15:12:27 +0100 Subject: [PATCH 06/43] Use absolute paths for install directories Fixes: BZ#1632814 --- minizip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 14afad5..e6ef24e 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,11 +1,13 @@ Name: minizip Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/nmoinvaz/minizip/pull/350 +Patch0: cmake-absolute-paths.patch BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) @@ -61,6 +63,9 @@ rm -rf lib/bzip2 %{_includedir}/zip.h %changelog +* Wed Nov 28 2018 Patrik Novotný 2.8.0-2 +- Use absolute paths for install directories + * Wed Nov 28 2018 Patrik Novotný 2.8.0-1 - Update to upstream version 2.8.0 From f4fe4eeab441d52777f11a8888e4ce9b7120e678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 28 Nov 2018 16:17:11 +0100 Subject: [PATCH 07/43] Patch file using absolute paths --- cmake-absolute-paths.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 cmake-absolute-paths.patch diff --git a/cmake-absolute-paths.patch b/cmake-absolute-paths.patch new file mode 100644 index 0000000..3593204 --- /dev/null +++ b/cmake-absolute-paths.patch @@ -0,0 +1,32 @@ +From cde57e38025f798d9cf23ae3ecd3594e135e6ac6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= +Date: Wed, 28 Nov 2018 14:38:38 +0100 +Subject: [PATCH] Use absolute paths for install directories. + +--- + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3cc7bf59..a936be15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,12 +39,12 @@ include(CheckTypeSize) + include(GNUInstallDirs) + include(ExternalProject) + +-set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") +-set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") +-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") +-set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") +-set(INSTALL_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH "Installation directory for pkgconfig (.pc) files") +-set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/minizip CACHE PATH "Installation directory for cmake files.") ++set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables") ++set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries") ++set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers") ++set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}" CACHE PATH "Installation directory for manual pages") ++set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") ++set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/minizip" CACHE PATH "Installation directory for cmake files.") + + set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONLY) From 564bc07675d14f6ebf29cbc3229b9bccb324bd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 6 Dec 2018 13:31:35 +0100 Subject: [PATCH 08/43] Update to upstream release 2.8.1 --- .gitignore | 1 + minizip.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3c38fc0..43aecff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /minizip-2.5.0.tar.gz /minizip-2.5.4.tar.gz +/minizip-2.8.1.tar.gz diff --git a/minizip.spec b/minizip.spec index e6ef24e..69d8304 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,13 +1,11 @@ Name: minizip -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/nmoinvaz/minizip/pull/350 -Patch0: cmake-absolute-paths.patch BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) @@ -63,6 +61,9 @@ rm -rf lib/bzip2 %{_includedir}/zip.h %changelog +* Thu Dec 06 2018 Patrik Novotný 2.8.1-1 +- Update to upstream version 2.8.1 + * Wed Nov 28 2018 Patrik Novotný 2.8.0-2 - Use absolute paths for install directories diff --git a/sources b/sources index 73f811e..ae8b750 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.0.tar.gz) = c6d46071cbe393dd3c9df2f414cc553b4a3595956dc9cf6d4130d61d880e87d11e1e763860aecbc949ee3152857fd28aa98e4d92ddbee89ef8645916f7658aed +SHA512 (minizip-2.8.1.tar.gz) = c54bcfb5c08588469435e472d589ee2a35deff436b2f5754a4e0e50c33e5a1da3f0fcf7379d23505da1e0dd99b69259b370bc1a5472886b66b31b679595dac32 From 3caa7e66d7e21bd03f0f172bffc3a27a971685ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 30 Jan 2019 15:50:27 +0100 Subject: [PATCH 09/43] Update to upstream release 2.8.3 and run tests --- .gitignore | 1 + minizip.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 43aecff..bf9418e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /minizip-2.5.0.tar.gz /minizip-2.5.4.tar.gz /minizip-2.8.1.tar.gz +/minizip-2.8.3.tar.gz diff --git a/minizip.spec b/minizip.spec index 69d8304..1892fae 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.8.1 +Version: 2.8.3 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -36,24 +36,31 @@ rm -rf lib/bzip2 %build -%cmake . +%cmake . -DMZ_BUILD_TEST=ON %make_build + %install %make_install +%check +make test + + %ldconfig_scriptlets %files +%exclude %{_bindir}/%{name} +%exclude %{_libdir}/debug/usr/bin/%{name}-%{version}-%{release}.%{_arch}.debug %license LICENSE %doc README.md -%{_libdir}/lib%{name}.so.* +%{_libdir}/%{name}.so.* %files devel -%{_libdir}/lib%{name}.so +%{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name} %{_includedir}/mz*.h @@ -61,6 +68,9 @@ rm -rf lib/bzip2 %{_includedir}/zip.h %changelog +* Wed Jan 30 2019 Patrik Novotný 2.8.3-1 +- Update to upstream version 2.8.3 + * Thu Dec 06 2018 Patrik Novotný 2.8.1-1 - Update to upstream version 2.8.1 diff --git a/sources b/sources index ae8b750..d34268f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.1.tar.gz) = c54bcfb5c08588469435e472d589ee2a35deff436b2f5754a4e0e50c33e5a1da3f0fcf7379d23505da1e0dd99b69259b370bc1a5472886b66b31b679595dac32 +SHA512 (minizip-2.8.3.tar.gz) = cec7f7e39e80063da93c840a560e98d101381b652b19ffe3a4dfe71590fa485fe5859bb1978118d9ca7e3747237b07f2092e238dc34f4c92c2e23c2fcf7a9f7b From 14d1db69c353adaffee4b8e817ddae34f388e3f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:04:40 +0000 Subject: [PATCH 10/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 1892fae..29ff2e4 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/zip.h %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 30 2019 Patrik Novotný 2.8.3-1 - Update to upstream version 2.8.3 From fe701160848e5547f0d4c7056caeaeb6fab9e01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 12 Feb 2019 17:37:18 +0100 Subject: [PATCH 11/43] Fix ldconfig in %post and %postun --- minizip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/minizip.spec b/minizip.spec index 29ff2e4..ed15ef0 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -47,8 +47,8 @@ rm -rf lib/bzip2 %check make test - -%ldconfig_scriptlets +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files @@ -68,6 +68,9 @@ make test %{_includedir}/zip.h %changelog +* Tue Feb 12 2019 Patrik Novotný 2.8.3-3 +- Fix ldconfig execution during build + * Fri Feb 01 2019 Fedora Release Engineering - 2.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d84b58990f9147422b34e3c9fbe4dda28bed0dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 13 Feb 2019 15:37:51 +0100 Subject: [PATCH 12/43] Fix shared library prefix --- minizip-2.8.3_lib_prefix.patch | 20 ++++++++++++++++++++ minizip.spec | 11 ++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 minizip-2.8.3_lib_prefix.patch diff --git a/minizip-2.8.3_lib_prefix.patch b/minizip-2.8.3_lib_prefix.patch new file mode 100644 index 0000000..f20b492 --- /dev/null +++ b/minizip-2.8.3_lib_prefix.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d070550..a191805 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -599,7 +599,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES + VERSION ${VERSION} + SOVERSION ${SOVERSION} + LINKER_LANGUAGE C +- PREFIX "" ++ PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} + DEFINE_SYMBOL "MZ_EXPORTS" + POSITION_INDEPENDENT_CODE 1) + if(MZ_LZMA) +@@ -804,4 +804,4 @@ if(MZ_BUILD_FUZZ_TEST) + install(TARGETS zip_fuzzer RUNTIME DESTINATION "bin") + install(TARGETS unzip_fuzzer RUNTIME DESTINATION "bin") + endif() +-endif() ++endif() +\ No newline at end of file diff --git a/minizip.spec b/minizip.spec index ed15ef0..b3d67bf 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,12 +1,14 @@ Name: minizip Version: 2.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: minizip-2.8.3_lib_prefix.patch + BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -56,11 +58,11 @@ make test %exclude %{_libdir}/debug/usr/bin/%{name}-%{version}-%{release}.%{_arch}.debug %license LICENSE %doc README.md -%{_libdir}/%{name}.so.* +%{_libdir}/lib%{name}.so.* %files devel -%{_libdir}/%{name}.so +%{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name} %{_includedir}/mz*.h @@ -68,6 +70,9 @@ make test %{_includedir}/zip.h %changelog +* Wed Feb 13 2019 Patrik Novotný 2.8.3-4 +- Fix shared library prefix + * Tue Feb 12 2019 Patrik Novotný 2.8.3-3 - Fix ldconfig execution during build From f37d04b864425d1c3398daf87c5a117d7fc5364d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 21 Mar 2019 13:55:37 +0100 Subject: [PATCH 13/43] Rebase to upstream release 2.8.5 --- .gitignore | 1 + minizip.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bf9418e..45e51e7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /minizip-2.5.4.tar.gz /minizip-2.8.1.tar.gz /minizip-2.8.3.tar.gz +/minizip-2.8.5.tar.gz diff --git a/minizip.spec b/minizip.spec index b3d67bf..4eafa4f 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,14 +1,12 @@ Name: minizip -Version: 2.8.3 -Release: 4%{?dist} +Version: 2.8.5 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: minizip-2.8.3_lib_prefix.patch - BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -70,6 +68,9 @@ make test %{_includedir}/zip.h %changelog +* Thu Mar 21 2019 Patrik Novotný 2.8.5-1 +- Rebase to upstream version 2.8.5 + * Wed Feb 13 2019 Patrik Novotný 2.8.3-4 - Fix shared library prefix diff --git a/sources b/sources index d34268f..1fdd391 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.3.tar.gz) = cec7f7e39e80063da93c840a560e98d101381b652b19ffe3a4dfe71590fa485fe5859bb1978118d9ca7e3747237b07f2092e238dc34f4c92c2e23c2fcf7a9f7b +SHA512 (minizip-2.8.5.tar.gz) = b8b1e0ec4c5f77c4424da36a581d241799131809695862751739ede2946bd535a1342edfaf75080a769e3413022ea94667ec21247a23999b0f71267a1de00a6e From bdb9852c17c25465dee2da59639365c2c26bb5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 9 Apr 2019 12:45:26 +0200 Subject: [PATCH 14/43] Rebase to upstream version 2.8.6 --- .gitignore | 1 + minizip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45e51e7..2699dee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /minizip-2.8.1.tar.gz /minizip-2.8.3.tar.gz /minizip-2.8.5.tar.gz +/minizip-2.8.6.tar.gz diff --git a/minizip.spec b/minizip.spec index 4eafa4f..a708133 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.8.5 +Version: 2.8.6 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -68,6 +68,9 @@ make test %{_includedir}/zip.h %changelog +* Tue Apr 09 2019 Patrik Novotný - 2.8.6-1 +- Rebase to upstream version 2.8.6 + * Thu Mar 21 2019 Patrik Novotný 2.8.5-1 - Rebase to upstream version 2.8.5 diff --git a/sources b/sources index 1fdd391..90785d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.5.tar.gz) = b8b1e0ec4c5f77c4424da36a581d241799131809695862751739ede2946bd535a1342edfaf75080a769e3413022ea94667ec21247a23999b0f71267a1de00a6e +SHA512 (minizip-2.8.6.tar.gz) = 95eadd2b313a23a34450b8a3937c083c62ed15ee8878de9331351e197bcf263b6fa2fd0915d8fa00b2c14b753b34a3e24c15bfbc0845de809fda52508f85c12b From 4546d475b905a8810c2bc6fa57ed7dc98f0f94ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 12 Jun 2019 11:42:55 +0200 Subject: [PATCH 15/43] New upstream version: 2.8.8 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2699dee..60330ce 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /minizip-2.8.3.tar.gz /minizip-2.8.5.tar.gz /minizip-2.8.6.tar.gz +/minizip-2.8.8.tar.gz diff --git a/minizip.spec b/minizip.spec index a708133..741ce33 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.8.6 +Version: 2.8.8 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -36,7 +36,7 @@ rm -rf lib/bzip2 %build -%cmake . -DMZ_BUILD_TEST=ON +%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON %make_build @@ -68,6 +68,9 @@ make test %{_includedir}/zip.h %changelog +* Wed Jun 12 2019 Patrik Novotný - 2.8.8-1 +- New upstream release: 2.8.8 + * Tue Apr 09 2019 Patrik Novotný - 2.8.6-1 - Rebase to upstream version 2.8.6 diff --git a/sources b/sources index 90785d1..8fce227 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.6.tar.gz) = 95eadd2b313a23a34450b8a3937c083c62ed15ee8878de9331351e197bcf263b6fa2fd0915d8fa00b2c14b753b34a3e24c15bfbc0845de809fda52508f85c12b +SHA512 (minizip-2.8.8.tar.gz) = 56a72c7e9c575623bd3a89c5bcf9889bcac85a554906cfd5f24b1bcbfccf59e6de8456ddc29c30271a4e217c0cd03da1a670f1cf463bc48a25e98c03df6ff738 From c0832db47f940db85b9c4992c6eb99e68c71f216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 17 Jun 2019 10:37:42 +0200 Subject: [PATCH 16/43] Move header files to minizip subdirectory Resolves: BZ#1709205 Version: 2.8.8-2 --- minizip.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/minizip.spec b/minizip.spec index 741ce33..9a3b3c4 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.8.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -36,7 +36,7 @@ rm -rf lib/bzip2 %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON +%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} %make_build @@ -63,11 +63,14 @@ make test %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name} -%{_includedir}/mz*.h -%{_includedir}/unzip.h -%{_includedir}/zip.h +%{_includedir}/%{name}/mz*.h +%{_includedir}/%{name}/unzip.h +%{_includedir}/%{name}/zip.h %changelog +* Mon Jun 17 2019 Patrik Novotný - 2.8.8-2 +- Move header files to minizip subdirectory (fix implicit conflict) + * Wed Jun 12 2019 Patrik Novotný - 2.8.8-1 - New upstream release: 2.8.8 From 4cf57f8a9f13dfe610c49beb44eea96a2bb06094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 8 Jul 2019 11:50:16 +0200 Subject: [PATCH 17/43] New upstream release: 2.8.9 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60330ce..8e9f2e9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /minizip-2.8.5.tar.gz /minizip-2.8.6.tar.gz /minizip-2.8.8.tar.gz +/minizip-2.8.9.tar.gz diff --git a/minizip.spec b/minizip.spec index 9a3b3c4..61ccfc6 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip -Version: 2.8.8 -Release: 2%{?dist} +Version: 2.8.9 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Mon Jul 08 2019 Patrik Novotný - 2.8.9-1 +- New upstream release: 2.8.9 + * Mon Jun 17 2019 Patrik Novotný - 2.8.8-2 - Move header files to minizip subdirectory (fix implicit conflict) diff --git a/sources b/sources index 8fce227..085f7a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.8.tar.gz) = 56a72c7e9c575623bd3a89c5bcf9889bcac85a554906cfd5f24b1bcbfccf59e6de8456ddc29c30271a4e217c0cd03da1a670f1cf463bc48a25e98c03df6ff738 +SHA512 (minizip-2.8.9.tar.gz) = 4cc2e213f3d981d6a85d6e7d36529fd0957e6a92d54f2ef36e26c6d8ea5962b10e10de1dab92208b06c61db766167cf37a7d44e866993546062312914cdec947 From 775660f7b525b82213119f78a401d1f27b1d7c3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:18:09 +0000 Subject: [PATCH 18/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 61ccfc6..49d611c 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.8.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.8.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 08 2019 Patrik Novotný - 2.8.9-1 - New upstream release: 2.8.9 From 61130dbf9270c2859cfeb4d1a76ea7d04201dbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 24 Sep 2019 16:12:49 +0200 Subject: [PATCH 19/43] New upstream release: 2.9.0 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9f2e9..03c1b18 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /minizip-2.8.6.tar.gz /minizip-2.8.8.tar.gz /minizip-2.8.9.tar.gz +/minizip-2.9.0.tar.gz diff --git a/minizip.spec b/minizip.spec index 49d611c..b99e39d 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip -Version: 2.8.9 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Sep 24 2019 Patrik Novotný - 2.9.0-1 +- New upstream release: 2.9.0 + * Thu Jul 25 2019 Fedora Release Engineering - 2.8.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 085f7a0..1b6c6af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.8.9.tar.gz) = 4cc2e213f3d981d6a85d6e7d36529fd0957e6a92d54f2ef36e26c6d8ea5962b10e10de1dab92208b06c61db766167cf37a7d44e866993546062312914cdec947 +SHA512 (minizip-2.9.0.tar.gz) = e4e1ba7400400e78493177a80d7b5e36cc4205e5b25233c885e262b7713f7a011ff3a6c4db9ac421eb146838876786589fed0a007b624e9cf08062e57bd91340 From a4e0bdd9cabb63177c2c9bc7072ed4d94d98bfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 25 Nov 2019 15:49:52 +0100 Subject: [PATCH 20/43] New upstream release 2.9.1 --- .gitignore | 1 + minizip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 03c1b18..046327f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /minizip-2.8.8.tar.gz /minizip-2.8.9.tar.gz /minizip-2.9.0.tar.gz +/minizip-2.9.1.tar.gz diff --git a/minizip.spec b/minizip.spec index b99e39d..79ae1ad 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Mon Nov 25 2019 Patrik Novotný - 2.9.1-1 +- New upstream release: 2.9.1 + * Tue Sep 24 2019 Patrik Novotný - 2.9.0-1 - New upstream release: 2.9.0 diff --git a/sources b/sources index 1b6c6af..9c5bef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.9.0.tar.gz) = e4e1ba7400400e78493177a80d7b5e36cc4205e5b25233c885e262b7713f7a011ff3a6c4db9ac421eb146838876786589fed0a007b624e9cf08062e57bd91340 +SHA512 (minizip-2.9.1.tar.gz) = 0fb9ad94eb9fb919a62595fba77cfbd8b845767dca1eb108071db18dacef5f2bce4f1fbaace2882aeff98a781ed5a08cdb5006dababa7d582c44a1c2b102a680 From 9185f8e0f530fcc21bf02dd55424c8d2b3e60923 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:37:39 +0000 Subject: [PATCH 21/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 79ae1ad..6270bc8 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 25 2019 Patrik Novotný - 2.9.1-1 - New upstream release: 2.9.1 From 7e29844677c4b06ccdda0b321685af5582d7a14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 5 May 2020 08:53:02 +0200 Subject: [PATCH 22/43] Rebase to upstream version 2.9.2 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 046327f..346f8ce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /minizip-2.8.9.tar.gz /minizip-2.9.0.tar.gz /minizip-2.9.1.tar.gz +/minizip-2.9.2.tar.gz diff --git a/minizip.spec b/minizip.spec index 6270bc8..8765f97 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip -Version: 2.9.1 -Release: 2%{?dist} +Version: 2.9.2 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue May 05 2020 Patrik Novotný - 2.9.2-1 +- Rebase to upstream release 2.9.2 + * Wed Jan 29 2020 Fedora Release Engineering - 2.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 9c5bef8..bf8514a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.9.1.tar.gz) = 0fb9ad94eb9fb919a62595fba77cfbd8b845767dca1eb108071db18dacef5f2bce4f1fbaace2882aeff98a781ed5a08cdb5006dababa7d582c44a1c2b102a680 +SHA512 (minizip-2.9.2.tar.gz) = 56b5443f79d1a0a5f563a563f7b1c27b0b0fc5ba5b37248367b204a89a9373df7d12ea802c678f3f39c987d5f1766003eac3dd31b643773afa4463a3f6406628 From 6892237970b235daf9f5777559da4983620ff3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 26 May 2020 13:51:10 +0200 Subject: [PATCH 23/43] Rebase to upstream release 2.9.3 --- .gitignore | 1 + minizip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 346f8ce..50ec7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /minizip-2.9.0.tar.gz /minizip-2.9.1.tar.gz /minizip-2.9.2.tar.gz +/minizip-2.9.3.tar.gz diff --git a/minizip.spec b/minizip.spec index 8765f97..dd49e9b 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.9.2 +Version: 2.9.3 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -68,6 +68,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue May 26 2020 Patrik Novotný - 2.9.3-1 +- Rebase to upstream release 2.9.3 + * Tue May 05 2020 Patrik Novotný - 2.9.2-1 - Rebase to upstream release 2.9.2 diff --git a/sources b/sources index bf8514a..8cf9580 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.9.2.tar.gz) = 56b5443f79d1a0a5f563a563f7b1c27b0b0fc5ba5b37248367b204a89a9373df7d12ea802c678f3f39c987d5f1766003eac3dd31b643773afa4463a3f6406628 +SHA512 (minizip-2.9.3.tar.gz) = 397a75fd36f0f0b16d7098ad4796177a40b187c220b09a8ed69e9170b9ac262644e55b5c3c27029ae53e8c4b76a04ffea2a25eba3e43c645b3bbaf568279dce4 From 826578ceede1fa95232c6c4b4f0ac47b0ab24442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 1 Jul 2020 11:23:53 +0200 Subject: [PATCH 24/43] Rebase to upstream release 2.10.0 --- .gitignore | 1 + minizip-2.10.0-use-pkgconfig-for-zstd.patch | 19 +++++++++++++++++++ minizip.spec | 14 ++++++++++---- sources | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 minizip-2.10.0-use-pkgconfig-for-zstd.patch diff --git a/.gitignore b/.gitignore index 50ec7e8..754080e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /minizip-2.9.1.tar.gz /minizip-2.9.2.tar.gz /minizip-2.9.3.tar.gz +/minizip-2.10.0.tar.gz diff --git a/minizip-2.10.0-use-pkgconfig-for-zstd.patch b/minizip-2.10.0-use-pkgconfig-for-zstd.patch new file mode 100644 index 0000000..456763c --- /dev/null +++ b/minizip-2.10.0-use-pkgconfig-for-zstd.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6deb4c..c579059 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,13 @@ endif() + # Check if zstd installation is present + if(MZ_ZSTD) + if(NOT ZSTD_FORCE_FETCH) +- find_package(ZSTD QUIET) ++ find_package(PkgConfig) ++ if(PKGCONFIG_FOUND) ++ pkg_check_modules(ZSTD libzstd) ++ endif() ++ if(NOT ZSTD_FOUND) ++ find_package(ZSTD QUIET) ++ endif() + endif() + if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH) + message(STATUS "Using ZSTD") diff --git a/minizip.spec b/minizip.spec index dd49e9b..f7fe0a2 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.9.3 +Version: 2.10.0 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -7,7 +7,10 @@ License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel +# https://github.com/nmoinvaz/minizip/pull/509 +Patch0: minizip-2.10.0-use-pkgconfig-for-zstd.patch + +BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel libzstd-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -31,12 +34,12 @@ Development files for %{name} library. %prep -%autosetup +%autosetup -p1 rm -rf lib/bzip2 %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} +%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF %make_build @@ -68,6 +71,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Wed Jul 01 2020 Patrik Novotný - 2.10.0-1 +- Rebase to upstream release 2.10.0 + * Tue May 26 2020 Patrik Novotný - 2.9.3-1 - Rebase to upstream release 2.9.3 diff --git a/sources b/sources index 8cf9580..195257b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.9.3.tar.gz) = 397a75fd36f0f0b16d7098ad4796177a40b187c220b09a8ed69e9170b9ac262644e55b5c3c27029ae53e8c4b76a04ffea2a25eba3e43c645b3bbaf568279dce4 +SHA512 (minizip-2.10.0.tar.gz) = 8717e00242ba4f8247ef60c925813bcfaf104243cdbfff4cca690e7c1f7da1132084e1b939b3adf1f019d220a1034f46f2fe2a543cca19106af5136e09d6af16 From 15951071820626a897ddb747212c470e5f79d9ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:07:00 +0000 Subject: [PATCH 25/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index f7fe0a2..97a18d9 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -71,6 +71,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 01 2020 Patrik Novotný - 2.10.0-1 - Rebase to upstream release 2.10.0 From 4b61069279ad7ac0b0716d988126fe632005bada Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:30:49 +0000 Subject: [PATCH 26/43] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 97a18d9..47c6b53 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -71,6 +71,10 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.10.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d0cd64d8a90bd9c3cf9b879dca8dc07dc57849e4 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 11 Aug 2020 19:44:08 +0200 Subject: [PATCH 27/43] Fix FTBFS caused by cmake changes Cause: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds Resolves: #1864153 --- minizip.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/minizip.spec b/minizip.spec index 47c6b53..7177812 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -40,11 +40,11 @@ rm -rf lib/bzip2 %build %cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF -%make_build +%cmake_build %install -%make_install +%cmake_install %check @@ -71,6 +71,10 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Aug 11 2020 Honza Horak - 2.10.0-4 +- Fix FTBFS caused by cmake changes + Resolves: #1864153 + * Sat Aug 01 2020 Fedora Release Engineering - 2.10.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 77156d49a1afb3a7d6cddd408f10094b3dcbde84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 13 Oct 2020 13:34:22 +0200 Subject: [PATCH 28/43] Rebase to upstream release 2.10.1 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 754080e..29b2f52 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /minizip-2.9.2.tar.gz /minizip-2.9.3.tar.gz /minizip-2.10.0.tar.gz +/minizip-2.10.1.tar.gz diff --git a/minizip.spec b/minizip.spec index 7177812..90afca3 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.10.1 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -71,6 +71,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Oct 13 2020 Patrik Novotný - 2.10.1 +- Rebase to upstream release 2.10.1 + * Tue Aug 11 2020 Honza Horak - 2.10.0-4 - Fix FTBFS caused by cmake changes Resolves: #1864153 diff --git a/sources b/sources index 195257b..fd8efef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-2.10.0.tar.gz) = 8717e00242ba4f8247ef60c925813bcfaf104243cdbfff4cca690e7c1f7da1132084e1b939b3adf1f019d220a1034f46f2fe2a543cca19106af5136e09d6af16 +SHA512 (minizip-2.10.1.tar.gz) = b5550d3ec6d5bbc6435277904d19db17ac944abaab854cbcc7bb861f7a7e2e0db414476e5bebd19f6370b177f60a94547b7a9c16627bce49af1cdb24a0e82c5e From 3b3f77bf32a4eafbcbceb2204cc6959d075e4082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 27 Oct 2020 10:18:47 +0100 Subject: [PATCH 29/43] Rebase to upstream release 2.10.2 --- .gitignore | 3 ++ minizip-2.10.0-use-pkgconfig-for-zstd.patch | 19 --------- minizip-2.10.2-BRG_FORCE_FETCH.patch | 42 +++++++++++++++++++ ...0.2-rename-gladmans-shared-libraries.patch | 32 ++++++++++++++ minizip.spec | 26 ++++++++---- sources | 4 +- 6 files changed, 98 insertions(+), 28 deletions(-) delete mode 100644 minizip-2.10.0-use-pkgconfig-for-zstd.patch create mode 100644 minizip-2.10.2-BRG_FORCE_FETCH.patch create mode 100644 minizip-2.10.2-rename-gladmans-shared-libraries.patch diff --git a/.gitignore b/.gitignore index 29b2f52..6cf040b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /minizip-2.9.3.tar.gz /minizip-2.10.0.tar.gz /minizip-2.10.1.tar.gz +/minizip-2.10.2.tar.gz +/aes-gladman-minizip-2.10.2.tar.gz +/sha-gladman-minizip-2.10.2.tar.gz diff --git a/minizip-2.10.0-use-pkgconfig-for-zstd.patch b/minizip-2.10.0-use-pkgconfig-for-zstd.patch deleted file mode 100644 index 456763c..0000000 --- a/minizip-2.10.0-use-pkgconfig-for-zstd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6deb4c..c579059 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,13 @@ endif() - # Check if zstd installation is present - if(MZ_ZSTD) - if(NOT ZSTD_FORCE_FETCH) -- find_package(ZSTD QUIET) -+ find_package(PkgConfig) -+ if(PKGCONFIG_FOUND) -+ pkg_check_modules(ZSTD libzstd) -+ endif() -+ if(NOT ZSTD_FOUND) -+ find_package(ZSTD QUIET) -+ endif() - endif() - if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH) - message(STATUS "Using ZSTD") diff --git a/minizip-2.10.2-BRG_FORCE_FETCH.patch b/minizip-2.10.2-BRG_FORCE_FETCH.patch new file mode 100644 index 0000000..530e011 --- /dev/null +++ b/minizip-2.10.2-BRG_FORCE_FETCH.patch @@ -0,0 +1,42 @@ +From 861ba9e9fe82403805119fb3879f77d2d80be1fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= +Date: Mon, 26 Oct 2020 16:23:03 +0100 +Subject: [PATCH] Allow option to skip git clone for MZ_BRG + +Downloading additional sources during build is problematic for +distribution integration. +--- + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c7d45d..4f775d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,8 +31,9 @@ option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) + set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") + option(ZLIB_FORCE_FETCH "Skips find package for ZLIB" OFF) + option(ZSTD_FORCE_FETCH "Skips find package for ZSTD" OFF) ++option(BRG_FORCE_FETCH "Clone Brian Gladman's encryption library from GIT" ON) + +-mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH) ++mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH BRG_FORCE_FETCH) + + if(POLICY CMP0074) + cmake_policy(SET CMP0074 OLD) +@@ -489,8 +490,10 @@ endif() + + # Include Brian Gladman's crypto library + if(MZ_BRG) +- clone_repo(AES https://github.com/BrianGladman/aes) +- clone_repo(SHA https://github.com/BrianGladman/sha) ++ if(BRG_FORCE_FETCH) ++ clone_repo(AES https://github.com/BrianGladman/aes) ++ clone_repo(SHA https://github.com/BrianGladman/sha) ++ endif() + + set(BRG_AES_SRC + lib/aes/brg_endian.h +-- +2.26.2 + diff --git a/minizip-2.10.2-rename-gladmans-shared-libraries.patch b/minizip-2.10.2-rename-gladmans-shared-libraries.patch new file mode 100644 index 0000000..82f1709 --- /dev/null +++ b/minizip-2.10.2-rename-gladmans-shared-libraries.patch @@ -0,0 +1,32 @@ +From 3f9345400bec0676acbb023e0755fc7daee6a26a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= +Date: Tue, 27 Oct 2020 10:08:31 +0100 +Subject: [PATCH] Rename Brian Gladman's shared libraries + +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f775d8..b3e0649 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -521,12 +521,12 @@ if(MZ_BRG) + lib/sha/sha1.h + lib/sha/sha2.h) + +- add_library(aes STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) +- add_library(sha STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) ++ add_library(aes-gladman STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) ++ add_library(sha-gladman STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) + + list(APPEND MINIZIP_SRC mz_crypt_brg.c) + list(APPEND MINIZIP_INC lib/aes lib/sha) +- list(APPEND MINIZIP_DEP aes sha) ++ list(APPEND MINIZIP_DEP aes-gladman sha-gladman) + endif() + + # Include compatibility layer +-- +2.26.2 + diff --git a/minizip.spec b/minizip.spec index 90afca3..85f3474 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,16 +1,18 @@ Name: minizip -Version: 2.10.1 +Version: 2.10.2 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/BrianGladman/aes/archive/master.tar.gz#/aes-gladman-%{name}-%{version}.tar.gz +Source2: https://github.com/BrianGladman/sha/archive/master.tar.gz#/sha-gladman-%{name}-%{version}.tar.gz -# https://github.com/nmoinvaz/minizip/pull/509 -Patch0: minizip-2.10.0-use-pkgconfig-for-zstd.patch +Patch0: minizip-2.10.2-BRG_FORCE_FETCH.patch +Patch1: minizip-2.10.2-rename-gladmans-shared-libraries.patch -BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel libzstd-devel +BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel libzstd-devel xz-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -35,11 +37,16 @@ Development files for %{name} library. %prep %autosetup -p1 -rm -rf lib/bzip2 +mkdir lib +cd lib +gzip -dc %{_sourcedir}/aes-gladman-%{name}-%{version}.tar.gz | tar -xvvf - +gzip -dc %{_sourcedir}/sha-gladman-%{name}-%{version}.tar.gz | tar -xvvf - +mv aes{-master,} +mv sha{-master,} %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF +%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF -DBRG_FORCE_FETCH=OFF %cmake_build @@ -55,11 +62,11 @@ make test %files -%exclude %{_bindir}/%{name} -%exclude %{_libdir}/debug/usr/bin/%{name}-%{version}-%{release}.%{_arch}.debug %license LICENSE %doc README.md %{_libdir}/lib%{name}.so.* +%{_libdir}/libaes-gladman.a +%{_libdir}/libsha-gladman.a %files devel @@ -71,6 +78,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Mon Oct 26 2020 Patrik Novotný - 2.10.2-1 +- Rebase to upstream release 2.10.2 + * Tue Oct 13 2020 Patrik Novotný - 2.10.1 - Rebase to upstream release 2.10.1 diff --git a/sources b/sources index fd8efef..f604e2c 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (minizip-2.10.1.tar.gz) = b5550d3ec6d5bbc6435277904d19db17ac944abaab854cbcc7bb861f7a7e2e0db414476e5bebd19f6370b177f60a94547b7a9c16627bce49af1cdb24a0e82c5e +SHA512 (minizip-2.10.2.tar.gz) = ceb327315fe16fc010820f72c6ca780c9ce4769268750fbb81e4664f0c8e378272cb74fbe775bbd4211b907175f68812189a778c7d6b104523d99930763f60dd +SHA512 (aes-gladman-minizip-2.10.2.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 +SHA512 (sha-gladman-minizip-2.10.2.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36 From 45037acd747d2d4d4639c7e44bd1f85309aa6d9d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 01:47:23 +0000 Subject: [PATCH 30/43] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- minizip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/minizip.spec b/minizip.spec index 85f3474..ee36071 100644 --- a/minizip.spec +++ b/minizip.spec @@ -12,6 +12,7 @@ Source2: https://github.com/BrianGladman/sha/archive/master.tar.gz#/sha-g Patch0: minizip-2.10.2-BRG_FORCE_FETCH.patch Patch1: minizip-2.10.2-rename-gladmans-shared-libraries.patch +BuildRequires: make BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel libzstd-devel xz-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) From cc1161c19eac36578328581c40c7cb02dd224fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 12 Jan 2021 14:29:33 +0100 Subject: [PATCH 31/43] Rebase to upstream release 2.10.6 --- .gitignore | 3 +++ minizip-2.10.2-BRG_FORCE_FETCH.patch | 26 ++++++++++--------- ...0.2-rename-gladmans-shared-libraries.patch | 8 +++--- minizip.spec | 5 +++- sources | 6 ++--- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 6cf040b..5837f75 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ /minizip-2.10.2.tar.gz /aes-gladman-minizip-2.10.2.tar.gz /sha-gladman-minizip-2.10.2.tar.gz +/aes-gladman-minizip-2.10.6.tar.gz +/minizip-2.10.6.tar.gz +/sha-gladman-minizip-2.10.6.tar.gz diff --git a/minizip-2.10.2-BRG_FORCE_FETCH.patch b/minizip-2.10.2-BRG_FORCE_FETCH.patch index 530e011..4482437 100644 --- a/minizip-2.10.2-BRG_FORCE_FETCH.patch +++ b/minizip-2.10.2-BRG_FORCE_FETCH.patch @@ -13,23 +13,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7d45d..4f775d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,8 +31,9 @@ option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) - set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") - option(ZLIB_FORCE_FETCH "Skips find package for ZLIB" OFF) - option(ZSTD_FORCE_FETCH "Skips find package for ZSTD" OFF) +@@ -31,9 +31,10 @@ + option(MZ_BUILD_FUZZ_TEST "Builds minizip fuzzer executables" OFF) + option(MZ_CODE_COVERAGE "Builds with code coverage flags" OFF) + option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) +option(BRG_FORCE_FETCH "Clone Brian Gladman's encryption library from GIT" ON) + set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") --mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH) -+mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX ZLIB_FORCE_FETCH ZSTD_FORCE_FETCH BRG_FORCE_FETCH) +-mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX) ++mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX BRG_FORCE_FETCH) if(POLICY CMP0074) cmake_policy(SET CMP0074 OLD) -@@ -489,8 +490,10 @@ endif() +@@ -475,8 +476,10 @@ + message(FATAL_ERROR "AES and SHA libraries not found") + endif() - # Include Brian Gladman's crypto library - if(MZ_BRG) -- clone_repo(AES https://github.com/BrianGladman/aes) -- clone_repo(SHA https://github.com/BrianGladman/sha) +- clone_repo(aes https://github.com/BrianGladman/aes) +- clone_repo(sha https://github.com/BrianGladman/sha) + if(BRG_FORCE_FETCH) + clone_repo(AES https://github.com/BrianGladman/aes) + clone_repo(SHA https://github.com/BrianGladman/sha) @@ -37,6 +38,7 @@ index 3c7d45d..4f775d8 100644 set(BRG_AES_SRC lib/aes/brg_endian.h --- 2.26.2 +--- minizip-2.10.6/CMakeLists.txt 2020-12-29 22:16:01.000000000 +0100 ++++ blahbleh 2021-01-12 14:07:44.050770188 +0100 diff --git a/minizip-2.10.2-rename-gladmans-shared-libraries.patch b/minizip-2.10.2-rename-gladmans-shared-libraries.patch index 82f1709..59aae64 100644 --- a/minizip-2.10.2-rename-gladmans-shared-libraries.patch +++ b/minizip-2.10.2-rename-gladmans-shared-libraries.patch @@ -11,7 +11,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f775d8..b3e0649 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -521,12 +521,12 @@ if(MZ_BRG) +@@ -507,8 +507,8 @@ lib/sha/sha1.h lib/sha/sha2.h) @@ -20,6 +20,10 @@ index 4f775d8..b3e0649 100644 + add_library(aes-gladman STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) + add_library(sha-gladman STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) + # Check to see which random generation functions we have + check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM) +@@ -555,7 +555,7 @@ + list(APPEND MINIZIP_SRC mz_crypt_brg.c) list(APPEND MINIZIP_INC lib/aes lib/sha) - list(APPEND MINIZIP_DEP aes sha) @@ -27,6 +31,4 @@ index 4f775d8..b3e0649 100644 endif() # Include compatibility layer --- 2.26.2 - diff --git a/minizip.spec b/minizip.spec index ee36071..5e2f509 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 2.10.2 +Version: 2.10.6 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -79,6 +79,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Jan 12 2021 Patrik Novotný - 2.10.6-1 +- Rebase to upstream release 2.10.6 + * Mon Oct 26 2020 Patrik Novotný - 2.10.2-1 - Rebase to upstream release 2.10.2 diff --git a/sources b/sources index f604e2c..bfd6329 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (minizip-2.10.2.tar.gz) = ceb327315fe16fc010820f72c6ca780c9ce4769268750fbb81e4664f0c8e378272cb74fbe775bbd4211b907175f68812189a778c7d6b104523d99930763f60dd -SHA512 (aes-gladman-minizip-2.10.2.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 -SHA512 (sha-gladman-minizip-2.10.2.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36 +SHA512 (aes-gladman-minizip-2.10.6.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 +SHA512 (minizip-2.10.6.tar.gz) = 8ac8fb7325c6795379c49c1aff7e86ae06be18879e579a89c4c0c5b0726548cdfaa1afeeda06abf6be7496a8f3f2462266f976529fa75705f6ea9f89db70cac8 +SHA512 (sha-gladman-minizip-2.10.6.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36 From a5d3135fe14a930f83b2745bc0d6e7921e5c45a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:30:07 +0000 Subject: [PATCH 32/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 5e2f509..670c81e 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 2.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -79,6 +79,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.10.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 12 2021 Patrik Novotný - 2.10.6-1 - Rebase to upstream release 2.10.6 From d1964984c6fc2bc8b08af7e4c6d9e6eef557838f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 9 Feb 2021 10:28:10 +0100 Subject: [PATCH 33/43] Rebase to upstream release 3.0.0 Use OpenSSL instead of ports of Brian Gladman --- .gitignore | 1 + cmake-absolute-paths.patch | 32 -------------- minizip-2.10.2-BRG_FORCE_FETCH.patch | 44 ------------------- ...0.2-rename-gladmans-shared-libraries.patch | 34 -------------- minizip-2.8.3_lib_prefix.patch | 20 --------- minizip.spec | 35 +++++++-------- sources | 4 +- 7 files changed, 17 insertions(+), 153 deletions(-) delete mode 100644 cmake-absolute-paths.patch delete mode 100644 minizip-2.10.2-BRG_FORCE_FETCH.patch delete mode 100644 minizip-2.10.2-rename-gladmans-shared-libraries.patch delete mode 100644 minizip-2.8.3_lib_prefix.patch diff --git a/.gitignore b/.gitignore index 5837f75..6b5182e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /aes-gladman-minizip-2.10.6.tar.gz /minizip-2.10.6.tar.gz /sha-gladman-minizip-2.10.6.tar.gz +/minizip-3.0.0-1.fc34.src.rpm diff --git a/cmake-absolute-paths.patch b/cmake-absolute-paths.patch deleted file mode 100644 index 3593204..0000000 --- a/cmake-absolute-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cde57e38025f798d9cf23ae3ecd3594e135e6ac6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= -Date: Wed, 28 Nov 2018 14:38:38 +0100 -Subject: [PATCH] Use absolute paths for install directories. - ---- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3cc7bf59..a936be15 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,12 +39,12 @@ include(CheckTypeSize) - include(GNUInstallDirs) - include(ExternalProject) - --set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") --set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") --set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") --set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") --set(INSTALL_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH "Installation directory for pkgconfig (.pc) files") --set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/minizip CACHE PATH "Installation directory for cmake files.") -+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables") -+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries") -+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers") -+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}" CACHE PATH "Installation directory for manual pages") -+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") -+set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/minizip" CACHE PATH "Installation directory for cmake files.") - - set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONLY) diff --git a/minizip-2.10.2-BRG_FORCE_FETCH.patch b/minizip-2.10.2-BRG_FORCE_FETCH.patch deleted file mode 100644 index 4482437..0000000 --- a/minizip-2.10.2-BRG_FORCE_FETCH.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 861ba9e9fe82403805119fb3879f77d2d80be1fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= -Date: Mon, 26 Oct 2020 16:23:03 +0100 -Subject: [PATCH] Allow option to skip git clone for MZ_BRG - -Downloading additional sources during build is problematic for -distribution integration. ---- - CMakeLists.txt | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c7d45d..4f775d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,9 +31,10 @@ - option(MZ_BUILD_FUZZ_TEST "Builds minizip fuzzer executables" OFF) - option(MZ_CODE_COVERAGE "Builds with code coverage flags" OFF) - option(MZ_FILE32_API "Builds using posix 32-bit file api" OFF) -+option(BRG_FORCE_FETCH "Clone Brian Gladman's encryption library from GIT" ON) - set(MZ_PROJECT_SUFFIX "" CACHE STRING "Project name suffix for package managers") - --mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX) -+mark_as_advanced(MZ_FILE32_API MZ_PROJECT_SUFFIX BRG_FORCE_FETCH) - - if(POLICY CMP0074) - cmake_policy(SET CMP0074 OLD) -@@ -475,8 +476,10 @@ - message(FATAL_ERROR "AES and SHA libraries not found") - endif() - -- clone_repo(aes https://github.com/BrianGladman/aes) -- clone_repo(sha https://github.com/BrianGladman/sha) -+ if(BRG_FORCE_FETCH) -+ clone_repo(AES https://github.com/BrianGladman/aes) -+ clone_repo(SHA https://github.com/BrianGladman/sha) -+ endif() - - set(BRG_AES_SRC - lib/aes/brg_endian.h -2.26.2 - ---- minizip-2.10.6/CMakeLists.txt 2020-12-29 22:16:01.000000000 +0100 -+++ blahbleh 2021-01-12 14:07:44.050770188 +0100 diff --git a/minizip-2.10.2-rename-gladmans-shared-libraries.patch b/minizip-2.10.2-rename-gladmans-shared-libraries.patch deleted file mode 100644 index 59aae64..0000000 --- a/minizip-2.10.2-rename-gladmans-shared-libraries.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f9345400bec0676acbb023e0755fc7daee6a26a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= -Date: Tue, 27 Oct 2020 10:08:31 +0100 -Subject: [PATCH] Rename Brian Gladman's shared libraries - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f775d8..b3e0649 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -507,8 +507,8 @@ - lib/sha/sha1.h - lib/sha/sha2.h) - -- add_library(aes STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) -- add_library(sha STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) -+ add_library(aes-gladman STATIC ${BRG_AES_SRC} ${BRG_AES_HDR}) -+ add_library(sha-gladman STATIC ${BRG_SHA_SRC} ${BRG_SHA_HDR}) - - # Check to see which random generation functions we have - check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM) -@@ -555,7 +555,7 @@ - - list(APPEND MINIZIP_SRC mz_crypt_brg.c) - list(APPEND MINIZIP_INC lib/aes lib/sha) -- list(APPEND MINIZIP_DEP aes sha) -+ list(APPEND MINIZIP_DEP aes-gladman sha-gladman) - endif() - - # Include compatibility layer -2.26.2 diff --git a/minizip-2.8.3_lib_prefix.patch b/minizip-2.8.3_lib_prefix.patch deleted file mode 100644 index f20b492..0000000 --- a/minizip-2.8.3_lib_prefix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d070550..a191805 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -599,7 +599,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES - VERSION ${VERSION} - SOVERSION ${SOVERSION} - LINKER_LANGUAGE C -- PREFIX "" -+ PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} - DEFINE_SYMBOL "MZ_EXPORTS" - POSITION_INDEPENDENT_CODE 1) - if(MZ_LZMA) -@@ -804,4 +804,4 @@ if(MZ_BUILD_FUZZ_TEST) - install(TARGETS zip_fuzzer RUNTIME DESTINATION "bin") - install(TARGETS unzip_fuzzer RUNTIME DESTINATION "bin") - endif() --endif() -+endif() -\ No newline at end of file diff --git a/minizip.spec b/minizip.spec index 670c81e..75ef28a 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,21 +1,20 @@ Name: minizip -Version: 2.10.6 -Release: 2%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/BrianGladman/aes/archive/master.tar.gz#/aes-gladman-%{name}-%{version}.tar.gz -Source2: https://github.com/BrianGladman/sha/archive/master.tar.gz#/sha-gladman-%{name}-%{version}.tar.gz - -Patch0: minizip-2.10.2-BRG_FORCE_FETCH.patch -Patch1: minizip-2.10.2-rename-gladmans-shared-libraries.patch BuildRequires: make -BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel libzstd-devel xz-devel -Provides: bundled(aes-gladman) -Provides: bundled(sha1-gladman) +BuildRequires: cmake gcc-c++ +BuildRequires: libbsd-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: libzstd-devel +BuildRequires: xz-devel +BuildRequires: openssl-devel %description @@ -37,17 +36,11 @@ Development files for %{name} library. %prep -%autosetup -p1 -mkdir lib -cd lib -gzip -dc %{_sourcedir}/aes-gladman-%{name}-%{version}.tar.gz | tar -xvvf - -gzip -dc %{_sourcedir}/sha-gladman-%{name}-%{version}.tar.gz | tar -xvvf - -mv aes{-master,} -mv sha{-master,} +%autosetup -n %{name}-ng-%{version} %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF -DBRG_FORCE_FETCH=OFF +%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF %cmake_build @@ -66,8 +59,6 @@ make test %license LICENSE %doc README.md %{_libdir}/lib%{name}.so.* -%{_libdir}/libaes-gladman.a -%{_libdir}/libsha-gladman.a %files devel @@ -79,6 +70,10 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Tue Feb 09 2021 Patrik Novotný - 3.0.0-1 +- Rebase to upstream release 3.0.0 +- Use OpenSSL instead of BRG libraries + * Tue Jan 26 2021 Fedora Release Engineering - 2.10.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index bfd6329..fefe923 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (aes-gladman-minizip-2.10.6.tar.gz) = f9eb661b4c1dca7803b31be1e97a07e97e5042cda6ab390444626272e368a7bb5331c50c46c862e6901e03c4227222332efab6361880a49c9810fb3a734b6de8 -SHA512 (minizip-2.10.6.tar.gz) = 8ac8fb7325c6795379c49c1aff7e86ae06be18879e579a89c4c0c5b0726548cdfaa1afeeda06abf6be7496a8f3f2462266f976529fa75705f6ea9f89db70cac8 -SHA512 (sha-gladman-minizip-2.10.6.tar.gz) = 33f8915168fe161df3243731d8949611824abee36089eae91540162edc4b972d758268c7cab9e5fc7e908af5ce4affd8cdda7b0ce727b3d7c7f2ef15126e1e36 +SHA512 (minizip-3.0.0-1.fc34.src.rpm) = 3971f18d60faf7dc383edfecc44f2f4a0266ccfd41e443b257854703d78b111f281cca10f2351600222ca7641c8b4b45c007d33ea13e4e36944224a2772520f3 From 50aab4f37326f5c060bc242facb5f053da83f0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 9 Feb 2021 10:32:26 +0100 Subject: [PATCH 34/43] [FIXUP] sources file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6b5182e..f2952c1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /minizip-2.10.6.tar.gz /sha-gladman-minizip-2.10.6.tar.gz /minizip-3.0.0-1.fc34.src.rpm +/minizip-3.0.0.tar.gz diff --git a/sources b/sources index fefe923..c959b20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-3.0.0-1.fc34.src.rpm) = 3971f18d60faf7dc383edfecc44f2f4a0266ccfd41e443b257854703d78b111f281cca10f2351600222ca7641c8b4b45c007d33ea13e4e36944224a2772520f3 +SHA512 (minizip-3.0.0.tar.gz) = 4281095bf642ae0839b0253ccb2de59262f72f2671ec13f3a2d3c144dd5bce3d7105128b79e472d65f3c6621fa715668c29f2af8b6e2a7e8ebaa1e8ea4c00cab From 8e57659225a4cb3178cf97e521007b7381fcbfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 9 Feb 2021 11:46:08 +0100 Subject: [PATCH 35/43] [FIXUP] Explicit SONAME version in %files --- minizip.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 75ef28a..88c671e 100644 --- a/minizip.spec +++ b/minizip.spec @@ -58,7 +58,8 @@ make test %files %license LICENSE %doc README.md -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.3.0 +%{_libdir}/lib%{name}.so.3.0.0 %files devel From d1025645de36b086d7b9fe0e94c51c2dd20a7112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 14 Apr 2021 08:23:00 +0200 Subject: [PATCH 36/43] Rebase to upstream release 3.0.1 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2952c1..2d4f182 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /sha-gladman-minizip-2.10.6.tar.gz /minizip-3.0.0-1.fc34.src.rpm /minizip-3.0.0.tar.gz +/minizip-3.0.1.tar.gz diff --git a/minizip.spec b/minizip.spec index 88c671e..368925d 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -59,7 +59,7 @@ make test %license LICENSE %doc README.md %{_libdir}/lib%{name}.so.3.0 -%{_libdir}/lib%{name}.so.3.0.0 +%{_libdir}/lib%{name}.so.3.0.1 %files devel @@ -71,6 +71,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Wed Apr 14 2021 Patrik Novotný - 3.0.1-1 +- Rebase to upstream release 3.0.1 + * Tue Feb 09 2021 Patrik Novotný - 3.0.0-1 - Rebase to upstream release 3.0.0 - Use OpenSSL instead of BRG libraries diff --git a/sources b/sources index c959b20..0dd70da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-3.0.0.tar.gz) = 4281095bf642ae0839b0253ccb2de59262f72f2671ec13f3a2d3c144dd5bce3d7105128b79e472d65f3c6621fa715668c29f2af8b6e2a7e8ebaa1e8ea4c00cab +SHA512 (minizip-3.0.1.tar.gz) = 98c9bdcea79a88a2dd69cec6c49f8565edf78ab9cddbf0e85e08b049b300b187f176bf57d5a894bf777bec0a097e46ecc05f78dab9cd5726fd473ffd8718dce0 From 05dce16f50d871e92fe7f72134f0de313855c75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 9 Jun 2021 06:02:38 +0200 Subject: [PATCH 37/43] Rebase to upstream release 3.0.2 --- .gitignore | 1 + minizip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d4f182..d75f0a4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /minizip-3.0.0-1.fc34.src.rpm /minizip-3.0.0.tar.gz /minizip-3.0.1.tar.gz +/minizip-3.0.2.tar.gz diff --git a/minizip.spec b/minizip.spec index 368925d..678a874 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,5 +1,5 @@ Name: minizip -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features @@ -59,7 +59,7 @@ make test %license LICENSE %doc README.md %{_libdir}/lib%{name}.so.3.0 -%{_libdir}/lib%{name}.so.3.0.1 +%{_libdir}/lib%{name}.so.3.0.2 %files devel @@ -71,6 +71,9 @@ make test %{_includedir}/%{name}/zip.h %changelog +* Wed Jun 09 2021 Patrik Novotný - 3.0.2-1 +- Rebase to upstream release 3.0.2 + * Wed Apr 14 2021 Patrik Novotný - 3.0.1-1 - Rebase to upstream release 3.0.1 diff --git a/sources b/sources index 0dd70da..65d3e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minizip-3.0.1.tar.gz) = 98c9bdcea79a88a2dd69cec6c49f8565edf78ab9cddbf0e85e08b049b300b187f176bf57d5a894bf777bec0a097e46ecc05f78dab9cd5726fd473ffd8718dce0 +SHA512 (minizip-3.0.2.tar.gz) = eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc From 8cf67250382a75229861c3f4f3c440b8bbcf8821 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 23 Jun 2021 10:25:45 -0500 Subject: [PATCH 38/43] drop ldconfig scriptlets (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets) drop explicit BR: make (already pulled in via cmake) %build: one cmake option per line %check: drop 'make test', does nothing -devel: drop explicit cmake dep (autodeps should add cmake-filesystem already) --- minizip.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/minizip.spec b/minizip.spec index 678a874..361714c 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,14 +1,14 @@ Name: minizip Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: make -BuildRequires: cmake gcc-c++ +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: libbsd-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -28,8 +28,7 @@ It also has the latest bug fixes that having been found all over the internet. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake zlib-devel - +Requires: zlib-devel %description devel Development files for %{name} library. @@ -40,7 +39,12 @@ Development files for %{name} library. %build -%cmake . -DMZ_BUILD_TEST=ON -DSKIP_INSTALL_BINARIES=ON -DINSTALL_INC_DIR=%{_includedir}/%{name} -DZSTD_FORCE_FETCH=OFF +%cmake \ + -DMZ_BUILD_TEST:BOOL=ON \ + -DSKIP_INSTALL_BINARIES:BOOL=ON \ + -DINSTALL_INC_DIR=%{_includedir}/%{name} \ + -DZSTD_FORCE_FETCH=OFF + %cmake_build @@ -48,13 +52,6 @@ Development files for %{name} library. %cmake_install -%check -make test - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - %files %license LICENSE %doc README.md @@ -70,7 +67,15 @@ make test %{_includedir}/%{name}/unzip.h %{_includedir}/%{name}/zip.h + %changelog +* Wed Jun 23 2021 Rex Dieter - 3.0.2-2 +- drop ldconfig scriptlets (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets) +- drop explicit BR: make (already pulled in via cmake) +- %%build: one cmake option per line +- %%check: drop 'make test', does nothing +- -devel: drop explicit cmake dep (autodeps should add cmake-filesystem already) + * Wed Jun 09 2021 Patrik Novotný - 3.0.2-1 - Rebase to upstream release 3.0.2 From f19b66448efa454c3b5db9ae799891aa65bdc2bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:02:41 +0000 Subject: [PATCH 39/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 361714c..fd8bdbc 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -69,6 +69,9 @@ Development files for %{name} library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 23 2021 Rex Dieter - 3.0.2-2 - drop ldconfig scriptlets (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets) - drop explicit BR: make (already pulled in via cmake) From 0070d7035056841bc2db66062c3055959759bc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 11 Aug 2021 19:12:24 +0200 Subject: [PATCH 40/43] Add patch to fix pkgconfig file --- minizip-ng-3.0.2-fix_pkgconfig.patch | 16 ++++++++++++++++ minizip.spec | 10 ++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 minizip-ng-3.0.2-fix_pkgconfig.patch diff --git a/minizip-ng-3.0.2-fix_pkgconfig.patch b/minizip-ng-3.0.2-fix_pkgconfig.patch new file mode 100644 index 0000000..9a166a0 --- /dev/null +++ b/minizip-ng-3.0.2-fix_pkgconfig.patch @@ -0,0 +1,16 @@ +Index: minizip-ng-3.0.2/minizip.pc.cmakein +=================================================================== +--- minizip-ng-3.0.2.orig/minizip.pc.cmakein ++++ minizip-ng-3.0.2/minizip.pc.cmakein +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@INSTALL_LIB_DIR@ +-sharedlibdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++sharedlibdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ + Description: Minizip zip file manipulation library diff --git a/minizip.spec b/minizip.spec index fd8bdbc..c89b066 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,12 +1,15 @@ Name: minizip Version: 3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# pkgconfig file must have full paths specified. +Patch0: minizip-ng-3.0.2-fix_pkgconfig.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libbsd-devel @@ -35,7 +38,7 @@ Development files for %{name} library. %prep -%autosetup -n %{name}-ng-%{version} +%autosetup -p 1 -n %{name}-ng-%{version} %build @@ -69,6 +72,9 @@ Development files for %{name} library. %changelog +* Wed Aug 11 2021 Björn Esser - 3.0.2-4 +- Add patch to fix pkgconfig file + * Thu Jul 22 2021 Fedora Release Engineering - 3.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e68553c3773718fe3da7949d26eacbbf723cdec8 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:07:50 +0200 Subject: [PATCH 41/43] Rebuilt with OpenSSL 3.0.0 --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index c89b066..6cfb3d8 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 3.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -72,6 +72,9 @@ Development files for %{name} library. %changelog +* Tue Sep 14 2021 Sahana Prasad - 3.0.2-5 +- Rebuilt with OpenSSL 3.0.0 + * Wed Aug 11 2021 Björn Esser - 3.0.2-4 - Add patch to fix pkgconfig file From 986471fd21accb400ade021ff02e8efa6de955b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:04:27 +0000 Subject: [PATCH 42/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- minizip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip.spec b/minizip.spec index 6cfb3d8..06536e5 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,6 +1,6 @@ Name: minizip Version: 3.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib @@ -72,6 +72,9 @@ Development files for %{name} library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 3.0.2-5 - Rebuilt with OpenSSL 3.0.0 From 352eb4cb90cf686ac848fc841918213ad1ec5883 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:29:11 +0300 Subject: [PATCH 43/43] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index ca25a41..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# minizip - -The minizip package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 65d3e47..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (minizip-3.0.2.tar.gz) = eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc