diff options
| -rw-r--r-- | gd.spec | 34 |
1 files changed, 14 insertions, 20 deletions
@@ -14,14 +14,14 @@ %bcond_without tests -%if 0%{?rhel} >= 7 && 0%{?rhel} <= 9 +%if 0%{?rhel} %bcond_without bump %else %bcond_with bump %endif %bcond_without webp -%if 0%{?fedora} >= 35 +%if 0%{?fedora} >= 35 || 0%{?rhel} >= 10 # disabled as breaks vertical text with freetype >= 2.11 # See https://bugzilla.redhat.com/2022957 # https://github.com/libgd/libgd/issues/790 @@ -38,8 +38,7 @@ %bcond_with avif %endif -# Disabled as only in rpmfusion -# Also see https://github.com/libgd/libgd/issues/678 - heif segfault +# See https://github.com/libgd/libgd/issues/678 - heif segfault %bcond_with heif %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 @@ -60,8 +59,8 @@ Name: gd3php Name: gd %endif Version: 2.3.3 -Release: 9%{?prever}%{?short}%{?dist} -License: MIT +Release: 10%{?prever}%{?short}%{?dist} +License: GD URL: http://libgd.github.io/ %if 0%{?commit:1} # git clone https://github.com/libgd/libgd.git; cd gd-libgd @@ -185,10 +184,10 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q -n libgd-%{version}%{?prever:-%{prever}} -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 %if %{with bump} -%patch2 -p1 +%patch -P2 -p1 %endif : $(perl config/getver.pl) @@ -263,10 +262,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %if %{with tests} %check XFAIL_TESTS="" -%if 0%{?fedora} <= 28 && 0%{?rhel} <= 7 -%ifarch %{ix86} -# See https://github.com/libgd/libgd/issues/359 -XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" +%if 0%{?rhel} == 10 +%ifarch x86_64 +XFAIL_TESTS="gdimagegrayscale/basic gdimagecopyresampled/bug00201" %endif %endif export XFAIL_TESTS @@ -281,14 +279,7 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %endif -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%endif - - %files -%{!?_licensedir:%global license %%doc} %license COPYING %if %{with bump} %{_libdir}/*.so.103* @@ -306,6 +297,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 2.3.3-10 +- EL-10 rebuild + * Thu Nov 17 2022 Remi Collet <remi@remirepo.net> - 2.3.3-9 - EL-9 rebuild for new libavif |