SPECS: cairo.spec - updated deps (ac/am, freetype for ps/pdf backe...

[qboosh]

Author: qboosh                       Date: Fri Aug 26 18:46:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated deps (ac/am, freetype for ps/pdf backends)
- don't try to enable quartz backend (not available on Linux)
  and xcb backend (on bcond - requires not released yet xcb)
- -devel doesn't obsolete standalone libpixman-devel

---- Files affected:
SPECS:
   cairo.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.34 SPECS/cairo.spec:1.35
--- SPECS/cairo.spec:1.34	Fri Aug 26 05:55:49 2005
+++ SPECS/cairo.spec	Fri Aug 26 20:46:28 2005
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	xcb	# enable XCB backend (XCB not released yet)
+#
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
@@ -10,16 +14,16 @@
 # Source0-md5:	f0ff35c91983b7bf226154e68b280be3
 URL:		http://cairographics.org/
 BuildConflicts:	libpixman-devel
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1.7
 BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel >= 2.1.0
+BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	glitz-devel >= 0.4.4
 BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-#BuildRequires:	xcb-devel (http://freedesktop.org/software/xcb - CVS only, not released yet)
+%{?with_xcb:BuildRequires:	xcb-devel}
 BuildRequires:	xrender-devel >= 0.6
 BuildRequires:	zlib-devel
 Requires:	freetype >= 2.1.0
@@ -73,11 +77,11 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	fontconfig-devel
-Requires:	freetype-devel >= 2.1.0
+Requires:	freetype-devel >= 2.1.4
 Requires:	glitz-devel >= 0.4.4
 Requires:	libpng-devel
+%{?with_xcb:Requires:	xcb-devel}
 Requires:	xrender-devel >= 0.6
-Obsoletes:	libpixman-devel
 
 %description devel
 Development files for Cairo library.
@@ -108,8 +112,7 @@
 %{__automake}
 %configure \
 	--enable-gtk-doc \
-	--enable-quartz  \
-	--enable-xcb \
+	%{?with_xcb:--enable-xcb} \
 	--enable-glitz \
 	--enable-ps \
 	--enable-pdf \
@@ -152,6 +155,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2005/08/26 18:46:28  qboosh
+- updated deps (ac/am, freetype for ps/pdf backends)
+- don't try to enable quartz backend (not available on Linux)
+  and xcb backend (on bcond - requires not released yet xcb)
+- -devel doesn't obsolete standalone libpixman-devel
+
 Revision 1.34  2005/08/26 03:55:49  aredridel
 - up to 1.0.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.34&r2=1.35&f=u