From f1b4990838fd485262fecfda3b092238baa3b01b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jun 2022 18:02:52 +0200 Subject: EL-7: devel requires libwebp7-devel (not libwebp-devel) --- gd.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gd.spec b/gd.spec index b443cc3..8661fbe 100644 --- a/gd.spec +++ b/gd.spec @@ -20,8 +20,9 @@ %bcond_without webp %if 0%{?fedora} >= 35 -# disabled as breaks vertical text +# disabled as breaks vertical text with freetype >= 2.11 # See https://bugzilla.redhat.com/2022957 +# https://github.com/libgd/libgd/issues/790 %bcond_with raqm %else %bcond_without raqm @@ -57,7 +58,7 @@ Name: gd3php Name: gd %endif Version: 2.3.3 -Release: 5%{?prever}%{?short}%{?dist} +Release: 6%{?prever}%{?short}%{?dist} License: MIT URL: http://libgd.github.io/ %if 0%{?commit:1} @@ -144,8 +145,12 @@ Requires: libjpeg-devel%{?_isa} Requires: libpng-devel%{?_isa} Requires: libtiff-devel%{?_isa} %if %{with webp} +%if 0%{?rhel} == 7 +Requires: libwebp7-devel%{?_isa} +%else Requires: libwebp-devel%{?_isa} %endif +%endif Requires: libX11-devel%{?_isa} Requires: libXpm-devel%{?_isa} Requires: zlib-devel%{?_isa} @@ -294,6 +299,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Jun 22 2022 Remi Collet - 2.3.3-6 +- EL-7: devel requires libwebp7-devel (not libwebp-devel) + * Tue Mar 29 2022 Remi Collet - 2.3.3-5 - rename to gd3php on EL-9 -- cgit