diff --git a/cairo.spec b/cairo.spec index 7bcd1e7..23f7ba4 100644 --- a/cairo.spec +++ b/cairo.spec @@ -2,15 +2,16 @@ %define freetype_version 2.1.9 %define fontconfig_version 2.2.95 -%if 0%{?fedora} < 27 +%if 0%{?fedora} < 27 || 0%{?rhel} %global cairogl --enable-gl +%global with_gl 1 %else %global cairogl --disable-gl %endif Name: cairo Version: 1.15.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A 2D graphics library License: LGPLv2 or MPLv1.1 @@ -29,8 +30,10 @@ BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: fontconfig-devel >= %{fontconfig_version} BuildRequires: glib2-devel BuildRequires: librsvg2-devel +%if 0%{?with_gl} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel +%endif %description Cairo is a 2D graphics library designed to provide high-quality display @@ -152,7 +155,7 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_libdir}/pkgconfig/cairo-xcb-shm.pc %{_libdir}/pkgconfig/cairo-xcb.pc %{_datadir}/gtk-doc/html/cairo -%if 0%{?fedora} < 27 +%if 0%{?with_gl} %{_includedir}/cairo/cairo-gl.h %{_libdir}/pkgconfig/cairo-egl.pc %{_libdir}/pkgconfig/cairo-gl.pc @@ -172,6 +175,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_libdir}/cairo/ %changelog +* Thu Mar 15 2018 Adam Jackson - 1.15.10-4 +- Drop cairo-gl in RHEL too. + * Wed Feb 07 2018 Fedora Release Engineering - 1.15.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild