packages (DEVEL): php/php.spec - final 5.3.0; system_gd from HEAD
arekm
arekm at pld-linux.org
Tue Jun 30 23:18:31 CEST 2009
Author: arekm Date: Tue Jun 30 21:18:31 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- final 5.3.0; system_gd from HEAD
---- Files affected:
packages/php:
php.spec (1.688.2.31 -> 1.688.2.32)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.688.2.31 packages/php/php.spec:1.688.2.32
--- packages/php/php.spec:1.688.2.31 Fri Apr 24 00:24:43 2009
+++ packages/php/php.spec Tue Jun 30 23:18:25 2009
@@ -34,6 +34,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
@@ -77,8 +78,7 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define rel 0.29
-%define snap 200904152030
+%define rel 0.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -87,12 +87,12 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
Version: 5.3.0
-Release: %{rel}@%{snap}
+Release: %{rel}
Epoch: 4
License: PHP
Group: Libraries
-Source0: http://snaps.php.net/%{name}5.3-%{snap}.tar.bz2
-# Source0-md5: 643edcf615d4d7423b5d709ad6ea670d
+Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+# Source0-md5: 846760cd655c98dfd86d6d97c3d964b0
Source3: %{name}-mod_%{name}.conf
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
@@ -141,8 +141,10 @@
BuildRequires: freetds-devel >= 0.82
%endif
BuildRequires: freetype-devel >= 2.0
+%if %{with 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}
@@ -196,9 +198,10 @@
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20041225
-%define zend_module_api 20090115
-%define zend_extension_api 220090115
+%define php_api_version 20090626
+%define zend_module_api 20090626
+%define zend_extension_api 220090626
+
%define zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
@@ -629,9 +632,11 @@
Group: Libraries
URL: http://www.php.net/manual/en/book.image.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%if %{with system_gd}
Requires: gd >= 2.0.28-4
Requires: gd(gif)
Requires: gd(imagerotate) = 5.2.0
+%endif
Provides: php(gd)
%description gd
@@ -1551,7 +1556,7 @@
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{name}5.3-%{snap}
+%setup -q
%patch0 -p1
%patch1 -p1
#%patch2 -p1
@@ -1569,7 +1574,9 @@
%patch15 -p1
%patch17 -p1
%patch18 -p1
+%if %{with system_gd}
%patch19 -p1
+%endif
%patch20 -p1
%patch21 -p1
@@ -1649,7 +1656,7 @@
sapi_args=''
case $sapi in
cgi)
- sapi_args='--enable-discard-path --enable-force-cgi-redirect'
+ sapi_args=''
;;
cli)
sapi_args='--disable-cgi'
@@ -1685,6 +1692,7 @@
--enable-fileinfo=shared \
--enable-ftp=shared \
--enable-gd-native-ttf \
+ --enable-intl=shared \
--enable-libxml \
--enable-magic-quotes \
--enable-mbstring=shared,all \
@@ -1730,7 +1738,7 @@
--with-iconv=shared \
--with-freetype-dir=shared \
--with-gettext=shared \
- --with-gd=shared \
+ --with-gd=shared%{?with_system_gd:,/usr} \
--with-gdbm \
--with-gmp=shared \
%{?with_imap:--with-imap=shared --with-imap-ssl} \
@@ -2238,7 +2246,7 @@
%doc php.ini-*
%doc CREDITS Zend/ZEND_CHANGES
%doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO*
-%doc README.PHP4-TO-PHP5-THIN-CHANGES README.UPDATE_5_2
+%doc README.PHP4-TO-PHP5-THIN-CHANGES
%doc README.namespaces
%dir %{_sysconfdir}
@@ -2670,6 +2678,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.688.2.32 2009/06/30 21:18:25 arekm
+- final 5.3.0; system_gd from HEAD
+
Revision 1.688.2.31 2009/04/23 22:24:43 glen
- --enable-mysqlnd-threading (maybe too experimental?)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.688.2.31&r2=1.688.2.32&f=u
More information about the pld-cvs-commit
mailing list