rpms/php/F-10 php-5.2.10-gnusrc.patch, NONE, 1.1 php-5.2.8-recode.patch, NONE, 1.1 php.spec, 1.164, 1.165 sources, 1.38, 1.39 php-5.2.9-gnusrc.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Thu Jun 25 17:49:40 UTC 2009
- Previous message (by thread): rpms/gnome-netstatus/devel iface.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 gnome-netstatus.spec, 1.44, 1.45 sources, 1.15, 1.16
- Next message (by thread): rpms/xlog/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xlog.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: remi
Update of /cvs/extras/rpms/php/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1200
Modified Files:
php.spec sources
Added Files:
php-5.2.10-gnusrc.patch php-5.2.8-recode.patch
Removed Files:
php-5.2.9-gnusrc.patch
Log Message:
- update to 5.2.10
- add interbase and recode sub-packages
- shared wddx + curl, both in common to avoid update issue
php-5.2.10-gnusrc.patch:
--- NEW FILE php-5.2.10-gnusrc.patch ---
diff -up php-5.2.10/configure.in.gnusrc php-5.2.10/configure.in
--- php-5.2.10/configure.in.gnusrc 2009-06-17 14:22:41.000000000 +0200
+++ php-5.2.10/configure.in 2009-06-21 09:59:48.000000000 +0200
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
dnl Setting up the PHP version based on the information above.
dnl -------------------------------------------------------------------------
diff -up php-5.2.10/ext/interbase/interbase.c.gnusrc php-5.2.10/ext/interbase/interbase.c
--- php-5.2.10/ext/interbase/interbase.c.gnusrc 2008-12-31 12:17:38.000000000 +0100
+++ php-5.2.10/ext/interbase/interbase.c 2009-06-21 09:59:48.000000000 +0200
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
diff -up php-5.2.10/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.2.10/ext/pdo_firebird/firebird_driver.c
--- php-5.2.10/ext/pdo_firebird/firebird_driver.c.gnusrc 2009-04-18 20:56:58.000000000 +0200
+++ php-5.2.10/ext/pdo_firebird/firebird_driver.c 2009-06-21 10:01:52.000000000 +0200
@@ -22,7 +22,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
#ifdef ZEND_ENGINE_2
diff -up php-5.2.10/ext/standard/file.c.gnusrc php-5.2.10/ext/standard/file.c
--- php-5.2.10/ext/standard/file.c.gnusrc 2009-05-24 18:02:22.000000000 +0200
+++ php-5.2.10/ext/standard/file.c 2009-06-21 09:59:48.000000000 +0200
@@ -118,7 +118,6 @@ php_file_globals file_globals;
#ifdef HAVE_FNMATCH
#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
#endif
#include <fnmatch.h>
#endif
diff -up php-5.2.10/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.2.10/ext/zlib/zlib_fopen_wrapper.c
--- php-5.2.10/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2009-01-20 16:43:05.000000000 +0100
+++ php-5.2.10/ext/zlib/zlib_fopen_wrapper.c 2009-06-21 09:59:48.000000000 +0200
@@ -19,8 +19,6 @@
/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.7 2009/01/20 15:43:05 felipe Exp $ */
-#define _GNU_SOURCE
-
#include "php.h"
#include "php_zlib.h"
#include "fopen_wrappers.h"
diff -up php-5.2.10/main/php.h.gnusrc php-5.2.10/main/php.h
--- php-5.2.10/main/php.h.gnusrc 2008-12-31 12:17:47.000000000 +0100
+++ php-5.2.10/main/php.h 2009-06-21 09:59:48.000000000 +0200
@@ -30,6 +30,7 @@
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
+#include "php_config.h"
#include "php_version.h"
#include "zend.h"
#include "zend_qsort.h"
diff -up php-5.2.10/main/streams/cast.c.gnusrc php-5.2.10/main/streams/cast.c
--- php-5.2.10/main/streams/cast.c.gnusrc 2009-06-03 10:59:19.000000000 +0200
+++ php-5.2.10/main/streams/cast.c 2009-06-21 10:02:10.000000000 +0200
@@ -18,7 +18,6 @@
/* $Id: cast.c,v 1.12.2.1.2.6 2009/06/03 08:59:19 kalle Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
diff -up php-5.2.10/main/streams/memory.c.gnusrc php-5.2.10/main/streams/memory.c
--- php-5.2.10/main/streams/memory.c.gnusrc 2009-05-16 22:28:02.000000000 +0200
+++ php-5.2.10/main/streams/memory.c 2009-06-21 10:02:25.000000000 +0200
@@ -18,7 +18,6 @@
/* $Id: memory.c,v 1.8.2.6.2.21 2009/05/16 20:28:02 lbarnaud Exp $ */
-#define _GNU_SOURCE
#include "php.h"
PHPAPI int php_url_decode(char *str, int len);
diff -up php-5.2.10/main/streams/streams.c.gnusrc php-5.2.10/main/streams/streams.c
--- php-5.2.10/main/streams/streams.c.gnusrc 2009-05-17 16:59:24.000000000 +0200
+++ php-5.2.10/main/streams/streams.c 2009-06-21 10:02:42.000000000 +0200
@@ -21,7 +21,6 @@
/* $Id: streams.c,v 1.82.2.6.2.38 2009/05/17 14:59:24 lbarnaud Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
diff -up php-5.2.10/Zend/zend_language_parser.c.gnusrc php-5.2.10/Zend/zend_language_parser.c
--- php-5.2.10/Zend/zend_language_parser.c.gnusrc 2009-06-17 14:35:33.000000000 +0200
+++ php-5.2.10/Zend/zend_language_parser.c 2009-06-21 09:59:48.000000000 +0200
@@ -356,6 +356,8 @@
#include "zend_API.h"
#include "zend_constants.h"
+#include <string.h>
+
#define YYERROR_VERBOSE
#define YYSTYPE znode
php-5.2.8-recode.patch:
--- NEW FILE php-5.2.8-recode.patch ---
Allow recode to be built with imap and mysql. The conflict is due
to symbol conflicts between the recode libraries and anything else,
but these should not matter (right? right! everything is fine, really)
if the extensions are loaded as DSOs *and* the libraries are loaded
using the magic RTLD_DEEPBIND.
--- php-5.2.8/ext/recode/config9.m4.recode
+++ php-5.2.8/ext/recode/config9.m4
@@ -4,9 +4,6 @@ dnl
dnl Check for extensions with which Recode can not work
if test "$PHP_RECODE" != "no"; then
- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap"
- test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
-
if test -n "$recode_conflict"; then
AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
fi
Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/php.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- php.spec 17 Apr 2009 07:20:13 -0000 1.164
+++ php.spec 25 Jun 2009 17:49:39 -0000 1.165
@@ -6,8 +6,8 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.2.9
-Release: 2%{?dist}
+Version: 5.2.10
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -18,12 +18,13 @@ Source2: php.ini
Source3: macros.php
# Build fixes
-Patch1: php-5.2.9-gnusrc.patch
+Patch1: php-5.2.10-gnusrc.patch
Patch2: php-5.2.8-install.patch
Patch3: php-5.2.4-norpath.patch
Patch4: php-5.2.8-phpize64.patch
Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
+Patch7: php-5.2.8-recode.patch
# Fixes for extension modules
Patch20: php-4.3.11-shutdown.patch
@@ -90,7 +91,7 @@ Provides: php-zlib, php-json, php-zip, p
# To be split in php-process
Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
-Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
+Obsoletes: php-openssl, php-pecl-zip, php-pecl-json, php-json, php-dbase
%description common
The php-common package contains files used by both the php
@@ -210,6 +211,26 @@ BuildRequires: libxml2-devel
The php-soap package contains a dynamic shared object that will add
support to PHP for using the SOAP web services protocol.
+%package interbase
+Summary: A module for PHP applications that use Interbase/Firebird databases
+Group: Development/Languages
+BuildRequires: firebird-devel
+Requires: php-common = %{version}-%{release}, php-pdo
+Provides: php_database, php-firebird, php-pdo_firebird
+
+%description interbase
+The php-interbase package contains a dynamic shared object that will add
+database support through Interbase/Firebird to PHP.
+
+InterBase is the name of the closed-source variant of this RDBMS that was
+developed by Borland/Inprise.
+
+Firebird is a commercially independent project of C and C++ programmers,
+technical advisors and supporters developing and enhancing a multi-platform
+relational database management system based on the source code released by
+Inprise Corp (now known as Borland Software Corp) under the InterBase Public
+License.
+
%package snmp
Summary: A module for PHP applications that query SNMP-managed devices
Group: Development/Languages
@@ -355,6 +376,16 @@ BuildRequires: aspell-devel >= 0.50.0
The php-pspell package contains a dynamic shared object that will add
support for using the pspell library to PHP.
+%package recode
+Summary: A module for PHP applications for using the recode library
+Group: System Environment/Libraries
+Requires: php-common = %{version}-%{release}
+BuildRequires: recode-devel
+
+%description recode
+The php-recode package contains a dynamic shared object that will add
+support for using the recode library to PHP.
+
%prep
%setup -q
%patch1 -p1 -b .gnusrc
@@ -363,6 +394,7 @@ support for using the pspell library to
%patch4 -p1 -b .phpize64
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
+%patch7 -p1 -b .recode
%patch20 -p1 -b .shutdown
%patch21 -p1 -b .macropen
@@ -449,7 +481,6 @@ ln -sf ../configure
--disable-rpath \
--without-pear \
--with-bz2 \
- --with-curl \
--with-exec-dir=%{_bindir} \
--with-freetype-dir=%{_prefix} \
--with-png-dir=%{_prefix} \
@@ -470,7 +501,6 @@ ln -sf ../configure
--enable-magic-quotes \
--enable-sockets \
--enable-sysvsem --enable-sysvshm --enable-sysvmsg \
- --enable-wddx \
--with-kerberos \
--enable-ucd-snmp-hack \
--enable-shmop \
@@ -505,12 +535,16 @@ build --enable-force-cgi-redirect \
--with-ldap=shared --with-ldap-sasl \
--with-mysql=shared,%{_prefix} \
--with-mysqli=shared,%{_bindir}/mysql_config \
+ --with-interbase=shared,%{_libdir}/firebird \
+ --with-pdo-firebird=shared,%{_libdir}/firebird \
--enable-dom=shared \
--with-pgsql=shared \
+ --enable-wddx=shared \
--with-snmp=shared,%{_prefix} \
--enable-soap=shared \
--with-xsl=shared,%{_prefix} \
--enable-xmlreader=shared --enable-xmlwriter=shared \
+ --with-curl=shared,%{_prefix} \
--enable-fastcgi \
--enable-pdo=shared \
--with-pdo-odbc=shared,unixODBC,%{_prefix} \
@@ -527,14 +561,16 @@ build --enable-force-cgi-redirect \
--with-mhash=shared,%{_prefix} \
--with-tidy=shared,%{_prefix} \
--with-mssql=shared,%{_prefix} \
- --with-unixODBC=shared,%{_prefix}
+ --with-unixODBC=shared,%{_prefix} \
+ --with-recode=shared,%{_prefix}
popd
without_shared="--without-mysql --without-gd \
--without-unixODBC --disable-dom \
--disable-dba --without-unixODBC \
--disable-pdo --disable-xmlreader --disable-xmlwriter \
- --disable-json --without-pspell"
+ --disable-json --without-pspell --disable-wddx \
+ --without-curl"
# Build Apache module, and the CLI SAPI, /usr/bin/php
pushd build-apache
@@ -602,7 +638,8 @@ install -m 700 -d $RPM_BUILD_ROOT%{_loca
for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
- dbase mcrypt mhash tidy pdo_dblib mssql pspell; do
+ dbase mcrypt mhash tidy pdo_dblib mssql pspell curl wddx \
+ recode interbase pdo_firebird; do
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
; Enable ${mod} extension module
extension=${mod}.so
@@ -624,13 +661,14 @@ cat files.pdo_dblib >> files.mssql
cat files.pdo_mysql >> files.mysql
cat files.pdo_pgsql >> files.pgsql
cat files.pdo_odbc >> files.odbc
+cat files.pdo_firebird >> files.interbase
# Package pdo_sqlite with pdo; isolating the sqlite dependency
# isn't useful at this time since rpm itself requires sqlite.
cat files.pdo_sqlite >> files.pdo
# Package json, dbase and zip in -common.
-cat files.json files.dbase files.zip > files.common
+cat files.json files.dbase files.zip files.curl files.wddx > files.common
# Install the macros file:
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
@@ -717,8 +755,15 @@ rm files.* macros.php
%files tidy -f files.tidy
%files mssql -f files.mssql
%files pspell -f files.pspell
+%files recode -f files.recode
+%files interbase -f files.interbase
%changelog
+* Thu Jun 25 2009 Remi Collet <Fedora at famillecollet.com> 5.2.10-1
+- update to 5.2.10
+- add interbase and recode sub-packages
+- shared wddx + curl, both in common to avoid update issue
+
* Fri Apr 17 2009 Joe Orton <jorton at redhat.com> 5.2.9-2
- stay at v3 of systzdata patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources 16 Apr 2009 16:27:11 -0000 1.38
+++ sources 25 Jun 2009 17:49:39 -0000 1.39
@@ -1 +1 @@
-280d6cda7f72a4fc6de42fda21ac2db7 php-5.2.9.tar.bz2
+15c7b5a87f57332d6fc683528e28247b php-5.2.10.tar.bz2
--- php-5.2.9-gnusrc.patch DELETED ---
- Previous message (by thread): rpms/gnome-netstatus/devel iface.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 gnome-netstatus.spec, 1.44, 1.45 sources, 1.15, 1.16
- Next message (by thread): rpms/xlog/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xlog.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list