SPECS: gd.spec - xorg modular deps, rel 6

[wolf]

Author: wolf                         Date: Tue Feb 14 23:36:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- xorg modular deps, rel 6

---- Files affected:
SPECS:
   gd.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: SPECS/gd.spec
diff -u SPECS/gd.spec:1.115 SPECS/gd.spec:1.116
--- SPECS/gd.spec:1.115	Mon Aug 15 17:57:43 2005
+++ SPECS/gd.spec	Wed Feb 15 00:36:38 2006
@@ -10,7 +10,7 @@
 Summary(pt_BR):	Biblioteca para manipulaçăo de imagens
 Name:		gd
 Version:	2.0.33
-Release:	5
+Release:	6
 License:	BSD-like
 Group:		Libraries
 Source0:	http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
@@ -19,7 +19,6 @@
 Patch1:		%{name}-rotate_from_php.patch
 Patch2:		%{name}-graphviz.patch
 URL:		http://www.boutell.com/gd/
-%{?with_xpm:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 %{?with_fontconfig:BuildRequires:	fontconfig-devel}
@@ -29,6 +28,7 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.3
+%{?with_xpm:BuildRequires:	xorg-lib-libXpm}
 BuildRequires:	zlib-devel
 Provides:	gd(gif) = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,11 +73,11 @@
 Summary(pt_BR):	Arquivos de inclusăo e bibliotecas para desenvolver programas usando gd
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_xpm:Requires:	XFree86-devel}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 2.0
 Requires:	libjpeg-devel
 Requires:	libpng-devel
+%{?with_xpm:Requires:	xorg-lib-libXpm}
 Requires:	zlib-devel
 Provides:	gd-devel(gif) = %{version}-%{release}
 
@@ -143,8 +143,8 @@
 %patch1 -p1
 %patch2 -p1
 
-# hack to avoid inclusion of -s or -L/usr/%{_lib} in --ldflags
-%{__perl} -pi -e 's,\@LDFLAGS\@,-L/usr/X11R6/%{_lib},g' config/gdlib-config.in
+# hack to avoid inclusion of -s in --ldflags
+%{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
 
 %build
 %{__libtoolize}
@@ -196,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2006/02/14 23:36:38  wolf
+- xorg modular deps, rel 6
+
 Revision 1.115  2005/08/15 15:57:43  arekm
 - rel 5; include fixes from graphviz project
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gd.spec?r1=1.115&r2=1.116&f=u