SPECS: php.spec - rel 5; fix system_gd bcond

[arekm]

Author: arekm                        Date: Tue Mar 17 12:11:46 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 5; fix system_gd bcond

---- Files affected:
SPECS:
   php.spec (1.786 -> 1.787) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.786 SPECS/php.spec:1.787
--- SPECS/php.spec:1.786	Tue Mar 17 11:08:46 2009
+++ SPECS/php.spec	Tue Mar 17 13:11:41 2009
@@ -84,7 +84,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 4
+%define		rel 5
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -183,7 +183,7 @@
 BuildRequires:	freetds-devel
 %endif
 BuildRequires:	freetype-devel >= 2.0
-%if %{without system_gd}
+%if %{with system_gd}
 BuildRequires:	gd-devel >= 2.0.28-4
 BuildRequires:	gd-devel(imagerotate) = 5.2.0
 %endif
@@ -695,7 +695,7 @@
 Summary(pl.UTF-8):	Moduł GD dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-%if %{without system_gd}
+%if %{with system_gd}
 Requires:	gd >= 2.0.28-4
 Requires:	gd(gif)
 Requires:	gd(imagerotate) = 5.2.0
@@ -1639,7 +1639,9 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%if %{with system_gd}
 %patch19 -p1
+%endif
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -1867,7 +1869,7 @@
 	--with-iconv=shared \
 	--with-freetype-dir=shared \
 	--with-gettext=shared \
-	--with-gd=shared%{!?with_system_gd:,/usr} \
+	--with-gd=shared%{?with_system_gd:,/usr} \
 	--with-gdbm \
 	--with-gmp=shared \
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
@@ -2891,6 +2893,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.787  2009/03/17 12:11:41  arekm
+- rel 5; fix system_gd bcond
+
 Revision 1.786  2009/03/17 10:08:46  glen
 - add kolab patches (annotations, myrights); rel 4
 
================================================================

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