SPECS: cairo.spec - builds on AC

[glen]

Author: glen                         Date: Thu Sep 25 11:42:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds on AC

---- Files affected:
SPECS:
   cairo.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.85 SPECS/cairo.spec:1.86
--- SPECS/cairo.spec:1.85	Fri Jun 13 14:21:28 2008
+++ SPECS/cairo.spec	Thu Sep 25 13:42:29 2008
@@ -2,11 +2,15 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_with	glitz		# build with glitz backend
-%bcond_without	xcb		# XCB backend
-%bcond_with	tests		# perform tests (can fail due to out of memory)
-%bcond_without	lcd             # freetype LCD filtering (instead of internal)
-#
+%bcond_with		glitz		# build with glitz backend
+%if "%{pld_release}" == "ac"
+%bcond_with		xcb			# XCB backend
+%else
+%bcond_without	xcb			# XCB backend
+%endif
+%bcond_with	tests			# perform tests (can fail due to out of memory)
+%bcond_without	lcd			# freetype LCD filtering (instead of internal)
+
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
@@ -35,11 +39,16 @@
 BuildRequires:	pixman-devel >= 0.10.0
 BuildRequires:	pkgconfig
 BuildRequires:	poppler-glib-devel >= 0.8.0
+BuildRequires:	rpm >= 4.4.9-56
 %if %{with xcb}
 BuildRequires:	libxcb-devel >= 0.9.92
 BuildRequires:	xcb-util-devel >= 0.2
 %endif
+%if "%{pld_release}" == "ac"
+BuildRequires:	xrender-devel >= 0.6
+%else
 BuildRequires:	xorg-lib-libXrender-devel >= 0.6
+%endif
 BuildRequires:	zlib-devel
 %{!?with_lcd:Requires:	freetype >= 1:2.1.10}
 %{?with_lcd:Requires:	freetype >= 1:2.3.0}
@@ -86,7 +95,11 @@
 %{?with_xcb:Requires:	libxcb-devel >= 0.9.92}
 Requires:	pixman-devel >= 0.10.0
 %{?with_xcb:Requires:	xcb-util-devel >= 0.2}
+%if "%{pld_release}" == "ac"
+Requires:	xrender-devel >= 0.6
+%else
 Requires:	xorg-lib-libXrender-devel >= 0.6
+%endif
 
 %description devel
 Development files for Cairo library.
@@ -196,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2008/09/25 11:42:29  glen
+- builds on AC
+
 Revision 1.85  2008/06/13 12:21:28  qrczak
 - Updated the lcd patch, taken from
   http://bugs.freedesktop.org/show_bug.cgi?id=10301#c47
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cairo.spec?r1=1.85&r2=1.86&f=u