SPECS: cairo.spec - avoid to link with external libpixman, rel 3.

[aflinta]

Author: aflinta                      Date: Thu Aug 25 08:05:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid to link with external libpixman, rel 3.

---- Files affected:
SPECS:
   cairo.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.32 SPECS/cairo.spec:1.33
--- SPECS/cairo.spec:1.32	Wed Aug 17 19:19:41 2005
+++ SPECS/cairo.spec	Thu Aug 25 10:04:57 2005
@@ -3,21 +3,20 @@
 Summary(pl):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
 Version:	0.9.2
-Release:	2
+Release:	3
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
 # Source0-md5:	992095a5db597384a89b41e93737105d
 Patch0:		%{name}-bug4110.patch
 URL:		http://cairographics.org/
+BuildConflicts:	libpixman-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.1.0
 BuildRequires:	glitz-devel >= 0.4.4
 BuildRequires:	gtk-doc >= 1.3
-# libpixman incorporated (explanation in NEWS)
-#BuildRequires:	libpixman-devel >= 0.1.6
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -26,7 +25,6 @@
 BuildRequires:	zlib-devel
 Requires:	freetype >= 2.1.0
 Requires:	glitz >= 0.4.4
-#Requires:	libpixman >= 0.1.6
 Requires:	xrender >= 0.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,9 +76,9 @@
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 2.1.0
 Requires:	glitz-devel >= 0.4.4
-#Requires:	libpixman-devel >= 0.1.6
 Requires:	libpng-devel
 Requires:	xrender-devel >= 0.6
+Obsoletes:	libpixman-devel
 
 %description devel
 Development files for Cairo library.
@@ -151,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2005/08/25 08:04:57  aflinta
+- avoid to link with external libpixman, rel 3.
+
 Revision 1.32  2005/08/17 17:19:41  paladine
 - added bug4110 patch (thx freetz)
 - rel. 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.32&r2=1.33&f=u