From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 5 Jun 2003 10:45:11 +0000 (+0000)
Subject: - killed X11/Xpm entropy
X-Git-Tag: auto/ac/gd-2_0_15-3~6
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9cbadb56349f0f0cf1eb854ada23c8bb8a79d732;p=packages%2Fgd.git

- killed X11/Xpm entropy

Changed files:
    gd.spec -> 1.85
---

diff --git a/gd.spec b/gd.spec
index a320967..17bf824 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,6 +1,7 @@
 #
 # _without_gif	- without GIF support (patch from http://www.rhyme.com.au/gd/)
 # _without_lzw	- without LZW compression in GIF creation functions
+# _without_xpm	- without XPM support (requires X11 libs)
 #
 Summary:	Library for PNG, JPEG creation
 Summary(es):	Biblioteca para manipulación de imágenes
@@ -18,6 +19,8 @@ Patch1:		%{name}-gif-am.patch
 Patch2:		%{name}-fontpath.patch
 Patch3:		%{name}-no_ldflags_in_gdlib-config.patch
 URL:		http://www.boutell.com/gd/
+%{!?_without_xpm:BuildRequires:	XFree86-devel}
+%{?_without_xpm:BuildConflicts:	XFree86-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	freetype-devel >= 2.0
@@ -72,6 +75,7 @@ Summary(pl):	Cz
 Summary(pt_BR):	Arquivos de inclusão e bibliotecas para desenvolver programas usando gd
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
+%{!?_without_xpm:Requires:	XFree86-devel}
 Requires:	freetype-devel >= 2.0
 Requires:	libjpeg-devel
 Requires:	libpng-devel