SPECS (AC-branch): cairo.spec - 1.2.6

[aredridel]

Author: aredridel                    Date: Mon Jan  1 01:01:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 1.2.6

---- Files affected:
SPECS:
   cairo.spec (1.51.2.1 -> 1.51.2.2) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.51.2.1 SPECS/cairo.spec:1.51.2.2
--- SPECS/cairo.spec:1.51.2.1	Thu Mar 30 23:18:22 2006
+++ SPECS/cairo.spec	Mon Jan  1 02:01:09 2007
@@ -2,34 +2,33 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_with	xcb		# enable XCB backend (XCB not released yet)
+%bcond_with	glitz		# build with glitz 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
-Release:	1
+Version:	1.2.6
+Release:	2
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	9002b0e69b3f94831a22d3f2a7735ce2
+# Source0-md5:	487b3d7515752fe57f780d0fd707b01a
 Patch0:		%{name}-link.patch
 URL:		http://cairographics.org/
 BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake >= 1.7
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.1.10
-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}
 BuildRequires:	xrender-devel >= 0.6
 BuildRequires:	zlib-devel
 Requires:	freetype >= 1:2.1.10
-Requires:	glitz >= 0.4.4
+%{?with_glitz:Requires:	glitz >= 0.5.1}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,9 +78,8 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.1.10
-Requires:	glitz-devel >= 0.4.4
+%{?with_glitz:Requires:	glitz-devel >= 0.5.1}
 Requires:	libpng-devel
-%{?with_xcb:Requires:	xcb-devel}
 Requires:	xrender-devel >= 0.6
 
 %description devel
@@ -102,11 +100,24 @@
 %description static -l pl
 Statyczna biblioteka Cairo.
 
+%package apidocs
+Summary:	Cairo API documentation
+Summary(pl):	Dokumentacja API Cairo
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Cairo API documentation.
+
+%description apidocs -l pl
+Dokumentacja API Cairo. 
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -114,8 +125,7 @@
 %{__automake}
 %configure \
 	%{?with_apidocs:--enable-gtk-doc} \
-	%{?with_xcb:--enable-xcb} \
-	--enable-glitz \
+	%{?with_glitz:--enable-glitz} \
 	--enable-ps \
 	--enable-pdf \
 	--with-html-dir=%{_gtkdocdir}
@@ -146,20 +156,72 @@
 %{_libdir}/lib*.la
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/cairo
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/cairo
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.51.2.1  2006/03/30 21:18:22  freetz
-- 1.0.4, merged changes from HEAD
+Revision 1.51.2.2  2007/01/01 01:01:09  aredridel
+- 1.2.6
+
+Revision 1.57  2006/11/25 10:40:36  megabajt
+- release 2 (rebuild with P: *.la)
+
+Revision 1.56  2006/11/03 05:29:08  wrobell
+- ver. 1.2.6
+
+Revision 1.55  2006/08/20 08:45:47  freetz
+- 1.2.4
+
+Revision 1.54  2006/08/09 08:02:13  qboosh
+- added link patch to eliminate linking with -lSM -lICE
+- automake epoch
+
+Revision 1.53  2006/08/09 05:55:14  freetz
+- 1.2.2, apidocs subpkg
+
+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.2.1&r2=1.51.2.2&f=u