From f1fa4ac7d8de8dbec305caf5a4e46851ffec8eb3 Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Jan 29 2024 09:10:46 +0000
Subject: Build with system minizip-ng-compat


Add missing zlib.h include in ZipSerialize.cpp
Increase version control of minzip (so minizip-ng can be used)

---

diff --git a/Add-zlib-header.patch b/Add-zlib-header.patch
new file mode 100644
index 0000000..b87e954
--- /dev/null
+++ b/Add-zlib-header.patch
@@ -0,0 +1,12 @@
+diff --git a/src/util/ZipSerialize.cpp b/src/util/ZipSerialize.cpp
+index 87bf9db..fa79b52 100644
+--- a/src/util/ZipSerialize.cpp
++++ b/src/util/ZipSerialize.cpp
+@@ -23,6 +23,7 @@
+ #include "File.h"
+ #include "log.h"
+ 
++#include <zlib.h>
+ #include <minizip/unzip.h>
+ #include <minizip/zip.h>
+ #ifdef _WIN32
diff --git a/Increase_version_control.patch b/Increase_version_control.patch
new file mode 100644
index 0000000..6671291
--- /dev/null
+++ b/Increase_version_control.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a519f67..f7343eb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,7 @@ find_package(ZLIB REQUIRED)
+ find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19
+ if(UNIX AND NOT APPLE)
+     find_package(PkgConfig)
+-    pkg_check_modules(MINIZIP minizip IMPORTED_TARGET minizip<2.0.0)
++    pkg_check_modules(MINIZIP minizip IMPORTED_TARGET)
+ endif()
+ find_package(SWIG)
+ find_package(JNI)
diff --git a/libdigidocpp.spec b/libdigidocpp.spec
index a7d45d6..0d128d6 100644
--- a/libdigidocpp.spec
+++ b/libdigidocpp.spec
@@ -1,7 +1,7 @@
 Name:           libdigidocpp
 
 Version:        3.16.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Library offers creating, signing and verification of digitally signed documents
 License:        LGPLv2+
@@ -20,14 +20,15 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  xml-security-c-devel
 BuildRequires:  xsd
 BuildRequires:  zlib-devel
+BuildRequires:  minizip-ng-compat-devel
 # Provide xxd
 BuildRequires:  vim-common
 
 # Dynamically loaded libraries
 Requires:       opensc%{?_isa}
 
-Provides: bundled(minizip)
-
+Patch0:		Increase_version_control.patch
+Patch1:		Add-zlib-header.patch
 
 %description
 Libdigidocpp library offers creating, signing and verification of digitally
@@ -51,7 +52,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-doc package contains documentation provided by upstream.
 
 %prep
-%setup -q
+%autosetup -p 1
 # Compatibility macro XALAN_USING_XALAN() was removed in xalan-c 1.12. This
 # workaround is harmless when using older xalan-c versions. See
 # https://github.com/open-eid/libdigidocpp/issues/363 and the corresponding
@@ -63,6 +64,9 @@ find . -type f -execdir sed -r -i \
 # unpackaging and fixing the encoding
 rm -rf doc/sample_files.zip
 
+# Remove bundled minizip
+rm -rf src/minizip
+
 %build
 # the dot after %%{cmake} has been removed from Fedora because of
 # https://bugzilla.redhat.com/show_bug.cgi?id=2059201
@@ -120,6 +124,11 @@ rm -rf doc/sample_files.zip
 
 
 %changelog
+* Mon Jan 29 2024 Lukas Javorsky <ljavorsk@redhat.com> - 3.16.0-6
+- Build with system minizip-ng-compat
+- Add missing zlib.h include in ZipSerialize.cpp
+- Increase version control of minzip (so minizip-ng can be used)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild