From 4d2785ec3116947872f6f32dc4104e6d36d8a7a4 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 15 Mar 2018 16:08:24 +0100
Subject: [PATCH] don't mask /usr/include/crypt.h with minizip's internal
 header

Resolves: rhbz#1556438
Version: 1.2.11-7
---
 zlib.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/zlib.spec b/zlib.spec
index 2c2662f..0e67f2b 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,7 +1,7 @@
 Summary: The compression and decompression library
 Name: zlib
 Version: 1.2.11
-Release: 6%{?dist}
+Release: 7%{?dist}
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
 Group: System Environment/Libraries
@@ -92,6 +92,8 @@ cd contrib/minizip
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# https://github.com/madler/zlib/pull/229
+rm $RPM_BUILD_ROOT%_includedir/minizip/crypt.h
 
 %ldconfig_scriptlets
 %ldconfig_scriptlets -n minizip
@@ -128,6 +130,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Thu Mar 15 2018 Pavel Raiskup <praiskup@redhat.com> - 1.2.11-7
+- don't install crypt.h (rhbz#1424609)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild