From 1bdf3f68fafb333795c7fe7242a8a8b6d1a5c169 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Apr 13 2019 18:51:57 +0000 Subject: apply patch from psi.spec for new minizip pkg --- diff --git a/psi-plus.spec b/psi-plus.spec index a2af25f..36483c6 100644 --- a/psi-plus.spec +++ b/psi-plus.spec @@ -7,7 +7,7 @@ Summary: Jabber client based on Qt Name: psi-plus Version: 1.4.654 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 URL: https://%{name}.com @@ -46,14 +46,12 @@ BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(openssl) # FIXME drop compatibility to zlic when F29 becomes EOL -%if 0 -#%%{?fedora} >= 30 -BuildRequires: minizip-devel +# https://src.fedoraproject.org/rpms/psi/blob/master/f/psi.spec#_38 +%if 0%{?fedora} && 0%{?fedora} < 30 +BuildRequires: pkgconfig(minizip) %else -# minizip was a subpackage of zlib -BuildRequires: minizip-compat-devel +Provides: bundled(minizip) = 1.2 %endif - BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libotr) BuildRequires: pkgconfig(libidn) @@ -308,6 +306,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %changelog +* Sat Apr 13 2019 Raphael Groner - 1:1.4.654-2 +- apply patch from psi.spec for new minizip pkg in F30+, use bundled instead + * Sat Apr 13 2019 Raphael Groner - 1:1.4.654-1 - use latest snapshot