SPECS: libgdiplus.spec - use system cairo 1.4.12 by default (fixes...

[qboosh]

Author: qboosh                       Date: Sat Dec 15 16:40:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system cairo 1.4.12 by default (fixes CVE-2007-5503);
  internal cairo 1.4.10 contains no actual code modifications, so note was not true
- release 2

---- Files affected:
SPECS:
   libgdiplus.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: SPECS/libgdiplus.spec
diff -u SPECS/libgdiplus.spec:1.49 SPECS/libgdiplus.spec:1.50
--- SPECS/libgdiplus.spec:1.49	Sat Dec 15 15:24:49 2007
+++ SPECS/libgdiplus.spec	Sat Dec 15 17:40:53 2007
@@ -1,11 +1,8 @@
 # $Revision$, $Date$
 #
-# We still statically link in Cairo (and include the Cairo sources as part of
-# our libgdiplus tree). Two main reasons for that: First, it eases the
-# dependency hell a bit, there's not yet another lib you have to get and/or
-# build, second reason is that until we use Pango for text (see below), we can
-# do some private stuff to cairo to improve text-display related performance.
-# --- but: the first reason is meaningless in PLD, the second seems only theoretical
+# Conditional build:
+%bcond_with	internal_cairo	# internal cairo 1.4.10 instead of system one
+%bcond_with	pango		# use pango for text rendering (experimental; system cairo only)
 #
 # WARNING! libgdiplus will not work if compiled with -fomit-frame-pointer
 #
@@ -13,8 +10,12 @@
 Summary(pl.UTF-8):	Otwarta implementacja API GDI+
 Name:		libgdiplus
 Version:	1.2.6
-Release:	1
-License:	LGPL v2.1/MPL 1.1/MIT X11
+Release:	2
+%if %{with internal_cairo}
+License:	LGPL v2.1 or MPL 1.1
+%else
+License:	MIT X11
+%endif
 Group:		Libraries
 #Source0Download: http://www.go-mono.com/sources-stable/
 Source0:	http://www.go-mono.com/sources/libgdiplus/%{name}-%{version}.tar.bz2
@@ -23,6 +24,7 @@
 URL:		http://www.go-mono.com/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
+%{!?with_internal_cairo:BuildRequires:	cairo-devel >= 1.4.12}
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	giflib-devel
@@ -32,9 +34,12 @@
 BuildRequires:	libpng-devel >= 1.2
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
+%{?with_pango:BuildRequires:	pango-devel >= 1:1.10}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-lib-libXrender-devel
+%{!?with_internal_cairo:Requires:	cairo >= 1.4.12}
 Requires:	glib2 >= 1:2.2.3
+%{?with_pango:Requires:	pango >= 1:1.10}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,6 +57,7 @@
 Summary(pl.UTF-8):	Pliki programistyczne libgdiplus
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{!?with_internal_cairo:Requires:	cairo-devel >= 1.4.12}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 2.0
 Requires:	giflib-devel
@@ -60,6 +66,7 @@
 Requires:	libjpeg-devel
 Requires:	libpng-devel >= 1.2
 Requires:	libtiff-devel
+%{?with_pango:Requires:	pango-devel >= 1:1.10}
 Requires:	xorg-lib-libXrender-devel
 
 %description devel
@@ -97,7 +104,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_internal_cairo:--with-cairo=system} \
+	%{?with_pango:--with-pango}
 
 %{__make}
 
@@ -115,7 +124,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE NEWS README TODO
+%doc AUTHORS COPYING ChangeLog %{?with_internal_cairo:LICENSE} NEWS README TODO
 %attr(755,root,root) %{_libdir}/libgdiplus.so.*.*.*
 # needed at runtime for mono to load it as gdiplus.dll
 %attr(755,root,root) %{_libdir}/libgdiplus.so
@@ -135,6 +144,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2007-12-15 16:40:53  qboosh
+- use system cairo 1.4.12 by default (fixes CVE-2007-5503);
+  internal cairo 1.4.10 contains no actual code modifications, so note was not true
+- release 2
+
 Revision 1.49  2007-12-15 14:24:49  qboosh
 - BR+R libexif-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgdiplus.spec?r1=1.49&r2=1.50&f=u