SPECS: cairo.spec - updated to 1.8.0; merged changes from DEVEL

[megabajt]

Author: megabajt                     Date: Sun Sep 28 15:29:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.8.0; merged changes from DEVEL

---- Files affected:
SPECS:
   cairo.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.87 SPECS/cairo.spec:1.88
--- SPECS/cairo.spec:1.87	Fri Sep 26 00:21:45 2008
+++ SPECS/cairo.spec	Sun Sep 28 17:29:19 2008
@@ -2,41 +2,34 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_with		glitz		# build with glitz backend
+%bcond_with	glitz		# build with glitz backend
 %if "%{pld_release}" == "ac"
-%bcond_with		xcb			# XCB backend
+%bcond_with	xcb		# XCB backend
 %else
-%bcond_without	xcb			# XCB backend
+%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)
-
+%bcond_with	tests		# perform tests (can fail due to out of memory)
+#
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.6.4
-Release:	3
+Version:	1.8.0
+Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	a198d509f9e3a35b78de8bb02174ebb9
+# Source0-md5:	4ea70ea87b47e92d318d4e7f5b940f47
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-lt.patch
-Patch2:		%{name}-am.patch
-# The lcd patch is being maintained at
-# http://bugs.freedesktop.org/show_bug.cgi?id=10301
-Patch3:		%{name}-lcd-filter.patch
 URL:		http://cairographics.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.8
 BuildRequires:	fontconfig-devel
-%{!?with_lcd:BuildRequires:	freetype-devel >= 1:2.1.10}
-%{?with_lcd:BuildRequires:	freetype-devel >= 1:2.3.0}
+BuildRequires:	freetype-devel >= 1:2.3.0
 %{?with_glitz:BuildRequires:	glitz-devel >= 0.5.1}
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.6}
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
-BuildRequires:	pixman-devel >= 0.10.0
+BuildRequires:	pixman-devel >= 0.12.0
 BuildRequires:	pkgconfig
 BuildRequires:	poppler-glib-devel >= 0.8.0
 BuildRequires:	rpm >= 4.4.9-56
@@ -50,9 +43,9 @@
 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}
+Requires:	freetype >= 1:2.3.0
 %{?with_glitz:Requires:	glitz >= 0.5.1}
+Requires:	pixman >= 0.12.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,11 +82,11 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	fontconfig-devel
-Requires:	freetype-devel >= 1:2.1.10
+Requires:	freetype-devel >= 1:2.3.0
 %{?with_glitz:Requires:	glitz-devel >= 0.5.1}
 Requires:	libpng-devel
 %{?with_xcb:Requires:	libxcb-devel >= 0.9.92}
-Requires:	pixman-devel >= 0.10.0
+Requires:	pixman-devel >= 0.12.0
 %{?with_xcb:Requires:	xcb-util-devel >= 0.2}
 %if "%{pld_release}" == "ac"
 Requires:	xrender-devel >= 0.6
@@ -134,14 +127,11 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%{?with_lcd:%patch3 -p1}
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I build
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -209,11 +199,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2008/09/28 15:29:19  megabajt
+- updated to 1.8.0; merged changes from DEVEL
+
 Revision 1.87  2008/09/25 22:21:45  glen
 - release 3
 
 Revision 1.86  2008/09/25 11:42:29  glen
 - builds on AC
+
+Revision 1.85.2.1  2008/09/23 19:13:50  qboosh
+- updated to 1.7.6 snapshot
+- updated link patch, removed obsolete lt,am patches
+- lcd-filter patch removed (merged as internal-only cairo-ft functionality)
 
 Revision 1.85  2008/06/13 12:21:28  qrczak
 - Updated the lcd patch, taken from
================================================================

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