Rename minizip(-devel) to minizip-compat(-devel)

BZ#1615381
This commit is contained in:
Patrik Novotný 2018-08-29 14:56:53 +02:00
parent 6fff8aed07
commit 58764fc84f

View File

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