From c0832db47f940db85b9c4992c6eb99e68c71f216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= <panovotn@redhat.com>
Date: Mon, 17 Jun 2019 10:37:42 +0200
Subject: [PATCH] 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ý <panovotn@redhat.com> - 2.8.8-2
+- Move header files to minizip subdirectory (fix implicit conflict)
+
 * Wed Jun 12 2019 Patrik Novotný <panovotn@redhat.com> - 2.8.8-1
 - New upstream release: 2.8.8