diff --git a/gimp.changes b/gimp.changes index 67de9fa..760ab99 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Thu Nov 28 14:47:18 UTC 2024 - Dirk Stoecker + +- Fix jpeg-xl disabling, use proper with/without + +------------------------------------------------------------------- +Mon Nov 11 15:16:56 UTC 2024 - Lubos Kocman + +- Disable jpeg-xl support on SLES < 16.0 (SP6, SP7) + libjxl is only in Leap/PackageHUB but not in SLES. + Leap gets gimp binary rpms from SLES. + (helps to fix bsc#1233157) + +- Re-adding dropped references compared to SLES 15 SP6 changelog + CVE-2022-32990 CVE-2023-44441 CVE-2023-44442 + CVE-2023-44443 CVE-2023-44444 + bsc#1201192 bsc#1217160 bsc#1217161 bsc#1217162 bsc#1217163 +------------------------------------------------------------------- Fri Oct 18 08:15:54 UTC 2024 - Dominique Leuenberger - Add gtk-update-icon-cache BuildRequires: Ensure @@ -3347,4 +3364,3 @@ Fri Jun 20 01:59:59 CEST 2003 - ro@suse.de Tue Jun 10 13:16:54 CEST 2003 - sbrabec@suse.cz - Initial SuSE version of GTK2 port. - diff --git a/gimp.spec b/gimp.spec index d0fca00..be6f379 100644 --- a/gimp.spec +++ b/gimp.spec @@ -25,12 +25,18 @@ %else %bcond_with libheif %endif - +# --without-jpegxl on SLES 15 SP6 +%if 0%{?sle_version} && 0%{?sle_version} < 160000 +%bcond_with libjpegxl +%else +%bcond_without libjpegxl +%endif %if 0%{?sle_version} %bcond_with python_plugin %else %bcond_without python_plugin %endif + Name: gimp Version: 2.10.38 Release: 0 @@ -62,7 +68,9 @@ BuildRequires: intltool >= 0.40.1 BuildRequires: libtiff-devel BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: libxslt-tools +%if %{with libjpegxl} BuildRequires: libjxl-devel >= 0.7.0 +%endif BuildRequires: pkgconfig %if %{with python_plugin} BuildRequires: python-gtk-devel >= 2.10.4 @@ -244,6 +252,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" --libexecdir=%{_libexecdir}\ --enable-default-binary\ --disable-check-update\ +%if %{without libjpegxl} + --without-jpegxl\ +%endif --enable-mp %make_build