rpms/cairo/devel cairo-1.1.6-do-not-build-pdf2svg.patch, NONE, 1.1 cairo.spec, 1.40, 1.41

[fedora-cvs-commits at redhat.com]

Author: cworth

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15491

Modified Files:
	cairo.spec 
Added Files:
	cairo-1.1.6-do-not-build-pdf2svg.patch 
Log Message:
Add cairo-1.1.6-do-not-build-pdf2svg.patch

cairo-1.1.6-do-not-build-pdf2svg.patch:
 Makefile.am |    5 -----
 1 files changed, 5 deletions(-)

--- NEW FILE cairo-1.1.6-do-not-build-pdf2svg.patch ---
--- cairo-1.1.6/test/Makefile.am.do-not-build-pdf2svg	2006-05-05 03:41:44.000000000 -0400
+++ cairo-1.1.6/test/Makefile.am	2006-05-05 03:41:58.000000000 -0400
@@ -330,11 +330,6 @@
 noinst_PROGRAMS += svg2png
 svg2png_CFLAGS = $(LIBRSVG_CFLAGS)
 svg2png_LDADD = $(LIBRSVG_LIBS)
-if CAIRO_CAN_TEST_PDF_SURFACE
-noinst_PROGRAMS += pdf2svg
-pdf2svg_CFLAGS = $(POPPLER_CFLAGS)
-pdf2svg_LDADD = $(LDADD) $(POPPLER_LIBS)
-endif
 endif
 
 CLEANFILES =					\


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cairo.spec	5 May 2006 07:29:43 -0000	1.40
+++ cairo.spec	5 May 2006 07:44:43 -0000	1.41
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.1.6
-Release:   1
+Release:   2
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -24,6 +24,7 @@
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
 Patch0: cairo-1.1.4-work-with-older-poppler.patch
+Patch1: cairo-1.1.6-do-not-build-pdf2svg.patch
 
 %description 
 Cairo is a vector graphics library designed to provide high-quality
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .work-with-older-poppler
+%patch1 -p1 -b .do-not-build-pdf2svg
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \
@@ -85,6 +87,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Fri May  5 2006 Carl Worth <cworth at redhat.com> - 1.1.6-2
+- Refuse to build pdf2svg to avoid depending on newer poppler
+
 * Fri May  5 2006 Carl Worth <cworth at redhat.com> - 1.1.6-1
 - Update to new upstream 1.1.6