From d973038afe270b1ba1e32601fcd5df49dead819a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Jul 13 2017 18:03:25 +0000 Subject: Disable cairo-gl in F27+ --- diff --git a/cairo.spec b/cairo.spec index 163d562..0b4ce47 100644 --- a/cairo.spec +++ b/cairo.spec @@ -2,9 +2,15 @@ %define freetype_version 2.1.9 %define fontconfig_version 2.2.95 +%if 0%{?fedora} < 27 +%global cairogl --enable-gl +%else +%global cairogl --disable-gl +%endif + Name: cairo Version: 1.14.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A 2D graphics library License: LGPLv2 or MPLv1.1 @@ -92,8 +98,8 @@ This package contains tools for working with the cairo graphics library. --enable-pdf \ --enable-svg \ --enable-tee \ - --enable-gl \ --enable-gobject \ + %{cairogl} \ --disable-gtk-doc sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -131,7 +137,6 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_includedir}/cairo/cairo-version.h %{_includedir}/cairo/cairo-xlib-xrender.h %{_includedir}/cairo/cairo-xlib.h -%{_includedir}/cairo/cairo-gl.h %{_includedir}/cairo/cairo-script.h %{_includedir}/cairo/cairo-xcb.h %{_libdir}/libcairo.so @@ -146,13 +151,16 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_libdir}/pkgconfig/cairo-tee.pc %{_libdir}/pkgconfig/cairo-xlib.pc %{_libdir}/pkgconfig/cairo-xlib-xrender.pc -%{_libdir}/pkgconfig/cairo-egl.pc -%{_libdir}/pkgconfig/cairo-gl.pc -%{_libdir}/pkgconfig/cairo-glx.pc %{_libdir}/pkgconfig/cairo-script.pc %{_libdir}/pkgconfig/cairo-xcb-shm.pc %{_libdir}/pkgconfig/cairo-xcb.pc %{_datadir}/gtk-doc/html/cairo +%if 0%{?fedora} < 27 +%{_includedir}/cairo/cairo-gl.h +%{_libdir}/pkgconfig/cairo-egl.pc +%{_libdir}/pkgconfig/cairo-gl.pc +%{_libdir}/pkgconfig/cairo-glx.pc +%endif %files gobject %{_libdir}/libcairo-gobject.so.* @@ -167,6 +175,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_libdir}/cairo/ %changelog +* Thu Jul 13 2017 Adam Jackson - 1.14.10-2 +- Disable cairo-gl in F27+ + * Fri Jun 16 2017 Kalev Lember - 1.14.10-1 - Update to 1.14.10