SPECS: php.spec - rel 3; use internal gd (enables few more php gd functions)

[arekm]

Author: arekm                        Date: Mon Mar 16 19:59:03 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; use internal gd (enables few more php gd functions)

---- Files affected:
SPECS:
   php.spec (1.784 -> 1.785) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.784 SPECS/php.spec:1.785
--- SPECS/php.spec:1.784	Mon Mar 16 16:14:49 2009
+++ SPECS/php.spec	Mon Mar 16 20:58:57 2009
@@ -18,6 +18,7 @@
 %bcond_with	fdf		# with FDF (PDF forms) module		(BR: proprietary lib)
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
+%bcond_with	system_gd	# with system gd (we prefer internal since it enables few more features)
 %bcond_without	curl		# without CURL extension module
 %bcond_without	filter		# without filter extension module
 %bcond_without	imap		# without IMAP extension module
@@ -83,7 +84,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 2
+%define		rel 3
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -180,8 +181,10 @@
 BuildRequires:	freetds-devel
 %endif
 BuildRequires:	freetype-devel >= 2.0
+%if %{without system_gd}
 BuildRequires:	gd-devel >= 2.0.28-4
 BuildRequires:	gd-devel(imagerotate) = 5.2.0
+%endif
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
 %{?with_imap:BuildRequires:	imap-devel >= 1:2001-0.BETA.200107022325.2}
@@ -690,9 +693,11 @@
 Summary(pl.UTF-8):	Moduł GD dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+%if %{without system_gd}
 Requires:	gd >= 2.0.28-4
 Requires:	gd(gif)
 Requires:	gd(imagerotate) = 5.2.0
+%endif
 Provides:	php(gd)
 
 %description gd
@@ -1858,7 +1863,7 @@
 	--with-iconv=shared \
 	--with-freetype-dir=shared \
 	--with-gettext=shared \
-	--with-gd=shared,/usr \
+	--with-gd=shared%{!?with_system_gd:,/usr} \
 	--with-gdbm \
 	--with-gmp=shared \
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
@@ -2882,6 +2887,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.785  2009/03/16 19:58:57  arekm
+- rel 3; use internal gd (enables few more php gd functions)
+
 Revision 1.784  2009/03/16 15:14:49  glen
 - cleanup the mess: use %{_sysconfig} only in this spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.784&r2=1.785&f=u