[packages/fbida] - unified cairogl bcond name

qboosh qboosh at pld-linux.org
Mon May 11 18:00:36 CEST 2020


commit 30c32325628f48a5c72e6d7c27b5a74bca7821cc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon May 11 18:01:04 2020 +0200

    - unified cairogl bcond name

 fbida.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/fbida.spec b/fbida.spec
index a9a5f48..ac697d8 100644
--- a/fbida.spec
+++ b/fbida.spec
@@ -10,7 +10,7 @@
 %bcond_without	pcd		# without PCD images support
 %bcond_without	sane		# without SANE scanning support (in ida)
 %bcond_without	webp		# without WebP images support
-%bcond_with	cairo_gl	# with Cairo-GL support (in fbpdf program)
+%bcond_with	cairogl		# with Cairo-GL support (in fbpdf program)
 
 %if %{without motif}
 # SANE used only in ida
@@ -52,7 +52,7 @@ BuildRequires:	libtiff-devel >= 4
 BuildRequires:	perl-base
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
-%{?with_cairo_gl:BuildRequires:	pkgconfig(cairo-gl)}
+%{?with_cairogl:BuildRequires:	pkgconfig(cairo-gl)}
 BuildRequires:	poppler-glib-devel
 %{?with_sane:BuildRequires:	sane-backends-devel}
 BuildRequires:	util-linux
@@ -148,7 +148,7 @@ CFLAGS="%{rpmcflags}" \
 %{__make} \
 	CC="%{__cc}" \
 	verbose=yes \
-	%{!?with_cairo_gl:HAVE_CAIRO_GL=no} \
+	%{!?with_cairogl:HAVE_CAIRO_GL=no} \
 	%{!?with_pcd:HAVE_LIBPCD=no} \
 	%{!?with_gif:HAVE_LIBGIF=no} \
 	%{!?with_webp:HAVE_LIBWEBP=no} \
@@ -164,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	prefix=%{_prefix} \
 	INSTALL_BINARY=install \
-	%{!?with_cairo_gl:HAVE_CAIRO_GL=no} \
+	%{!?with_cairogl:HAVE_CAIRO_GL=no} \
 	%{!?with_pcd:HAVE_LIBPCD=no} \
 	%{!?with_gif:HAVE_LIBGIF=no} \
 	%{!?with_webp:HAVE_LIBWEBP=no} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fbida.git/commitdiff/30c32325628f48a5c72e6d7c27b5a74bca7821cc



More information about the pld-cvs-commit mailing list