From 58764fc84f4a5fc4c527a8b3f67727430d82ec60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= <panovotn@redhat.com>
Date: Wed, 29 Aug 2018 14:56:53 +0200
Subject: [PATCH] Rename minizip(-devel) to minizip-compat(-devel)

    BZ#1615381
---
 zlib.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/zlib.spec b/zlib.spec
index c72e1c8..88e53b0 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -2,7 +2,7 @@
 
 Name:    zlib
 Version: 1.2.11
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: The compression and decompression library
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
@@ -22,6 +22,8 @@ Patch6: 0003-arm64-specific-build-patch.patch
 
 BuildRequires: automake, autoconf, libtool
 
+%global __provides_exclude_from ^%{_libdir}/pkgconfig/minizip\\.pc$
+
 %description
 Zlib is a general-purpose, patent-free, lossless data compression
 library which is used by many different programs.
@@ -48,22 +50,21 @@ decompression library.
 
 
 %if %{with minizip}
-%package -n minizip
+%package -n minizip-compat
 Summary: Library for manipulation with .zip archives
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: minizip-compat
 
-%description -n minizip
+%description -n minizip-compat
 Minizip is a library for manipulation with files from .zip archives.
 
 
-%package -n minizip-devel
+%package -n minizip-compat-devel
 Summary: Development files for the minizip library
-Requires: minizip%{?_isa} = %{version}-%{release}
+Requires: minizip-compat%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-Provides: minizip-compat-devel
+Conflicts: minizip-devel
 
-%description -n minizip-devel
+%description -n minizip-compat-devel
 This package contains the libraries and header files needed for
 developing applications which use minizip.
 %endif
@@ -146,12 +147,12 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %if %{with minizip}
-%files -n minizip
+%files -n minizip-compat
 %doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt
 %{_libdir}/libminizip.so.*
 
 
-%files -n minizip-devel
+%files -n minizip-compat-devel
 %dir %{_includedir}/minizip
 %{_includedir}/minizip/*.h
 %{_libdir}/libminizip.so
@@ -160,6 +161,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Wed Aug 29 2018 Patrik Novotný <panovotn@redhat.com> - 1.2.11-12
+- Rename minizip and minizip-devel to minizip-compat and minizip-compat-devel respectively
+
 * Thu Aug 23 2018 Patrik Novotný <panovotn@redhat.com> - 1.2.11-11
 - Provides minizip-compat and minizip-compat-devel