SPECS: cairo.spec - merged from DEVEL

[freetz]

Author: freetz                       Date: Sun Jul  2 15:36:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   cairo.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.51 SPECS/cairo.spec:1.52
--- SPECS/cairo.spec:1.51	Wed Mar 15 23:04:28 2006
+++ SPECS/cairo.spec	Sun Jul  2 17:36:18 2006
@@ -3,34 +3,33 @@
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_with	glitz		# build with glitz backend
-%bcond_with	xcb		# enable XCB backend (XCB not released yet)
+%bcond_with	xcb		# enable XCB backend
 %bcond_with	tests		# perform tests (can fail due to out of memory)
 #
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.0.4
+Version:	1.2.0
 Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	9002b0e69b3f94831a22d3f2a7735ce2
-Patch0:		%{name}-link.patch
+# Source0-md5:	5c9ad71d1b582907eee0497b196689ef
 URL:		http://cairographics.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1.7
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.1.10
-%{?with_glitz:BuildRequires:	glitz-devel >= 0.4.4}
+%{?with_glitz:BuildRequires:	glitz-devel >= 0.5.1}
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.3}
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-%{?with_xcb:BuildRequires:	xcb-devel}
+%{?with_xcb:BuildRequires:	libxcb-devel}
 BuildRequires:	xorg-lib-libXrender-devel >= 0.6
 BuildRequires:	zlib-devel
 Requires:	freetype >= 1:2.1.10
-%{?with_glitz:Requires:	glitz >= 0.4.4}
+%{?with_glitz:Requires:	glitz >= 0.5.1}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,9 +79,9 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.1.10
-%{?with_glitz:Requires:	glitz-devel >= 0.4.4}
+%{?with_glitz:Requires:	glitz-devel >= 0.5.1}
 Requires:	libpng-devel
-%{?with_xcb:Requires:	xcb-devel}
+%{?with_xcb:Requires:	libxcb-devel}
 Requires:	xorg-lib-libXrender-devel >= 0.6
 
 %description devel
@@ -105,9 +104,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -159,6 +158,39 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2006/07/02 15:36:18  freetz
+- merged from DEVEL
+
+Revision 1.51.4.10  2006/07/02 15:34:55  freetz
+- 1.2.0
+
+Revision 1.51.4.9  2006/06/29 12:18:32  pluto
+- release 2 for rebuild with new libpng soname.
+
+Revision 1.51.4.8  2006/06/16 18:28:17  freetz
+- 1.1.10
+
+Revision 1.51.4.7  2006/06/15 06:24:54  freetz
+- 1.1.8
+
+Revision 1.51.4.6  2006/06/06 18:20:03  freetz
+- rel.2
+
+Revision 1.51.4.5  2006/06/06 17:24:12  freetz
+- rel.1.1
+
+Revision 1.51.4.4  2006/06/06 17:18:33  freetz
+- refresh gtk-doc.make
+
+Revision 1.51.4.3  2006/05/11 12:53:31  qboosh
+- s/xcb/libxcb/
+
+Revision 1.51.4.2  2006/05/11 08:37:03  qboosh
+- updated to 1.1.6
+
+Revision 1.51.4.1  2006/04/27 09:02:32  qboosh
+- updated to 1.1.2, updated link patch
+
 Revision 1.51  2006/03/15 22:04:28  freetz
 - 1.0.4, gcc4 fix already included
 
================================================================

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