X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cairo.spec;h=1886b47125ff3f962837df016c8b41dc5e88f2d5;hb=2d024fa9f46c1f140d4f46e3bf688f6f06759730;hp=3395763787aad3bac513c765e5b9aa0cc45babb7;hpb=d55df9d3ae5d8d492b3512551e38468f3ce3b116;p=packages%2Fcairo.git

diff --git a/cairo.spec b/cairo.spec
index 3395763..1886b47 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -9,16 +9,18 @@
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.4.14
-Release:	1
+Version:	1.6.4
+Release:	0.1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	e8c442ff821c0719a69508fecba9038f
+# Source0-md5:	a198d509f9e3a35b78de8bb02174ebb9
 Patch0:		%{name}-link.patch
-# updated from http://david.freetype.org/lcd/cairo-1.2.4-lcd-filter-1.patch
-# NOTE: this patch wasn't applied upstream, is unmaintained by its author for
-# about a year and becomes more and more ugly => it's subject to drop soon  --q
+# Updated from http://david.freetype.org/lcd/cairo-1.2.4-lcd-filter-1.patch
+# The lcd patch is being maintained at
+# http://bugs.freedesktop.org/show_bug.cgi?id=10301
+# It is not applied upstream for political reasons (patents) and its fate has
+# not been decided yet AFAIK. -- Qrczak
 Patch1:		%{name}-1.2.4-lcd-filter-1.patch
 URL:		http://cairographics.org/
 BuildRequires:	autoconf >= 2.54
@@ -31,6 +33,8 @@ BuildRequires:	fontconfig-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	pixman-devel >= 0.10.0
+BuildRequires:	poppler-glib-devel >= 0.8.0
 %if %{with xcb}
 BuildRequires:	libxcb-devel >= 0.9.92
 BuildRequires:	xcb-util-devel >= 0.2
@@ -131,6 +135,8 @@ Dokumentacja API Cairo.
 	%{?with_glitz:--enable-glitz} \
 	--enable-ps \
 	--enable-pdf \
+	--enable-png \
+	--enable-freetype \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 %{?with_tests:%{__make} check}
@@ -141,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/cairo}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -150,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 # COPYING contains only notes, not LGPL/MPL texts
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libcairo.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcairo.so.2
 
@@ -165,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/cairo-png.pc
 %{_pkgconfigdir}/cairo-ps.pc
 %{_pkgconfigdir}/cairo-svg.pc
-%{_pkgconfigdir}/cairo-xcb.pc
+%{?with_xcb:%{_pkgconfigdir}/cairo-xcb.pc}
 %{_pkgconfigdir}/cairo-xlib.pc
 %{_pkgconfigdir}/cairo-xlib-xrender.pc
 
@@ -173,6 +181,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libcairo.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/cairo
+%endif