rpms/php/devel php-5.2.7-tests-dashn.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 php.spec, 1.162, 1.163 sources, 1.36, 1.37 php-5.2.4-tests-dashn.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8613

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.7-tests-dashn.patch 
Removed Files:
	php-5.2.4-tests-dashn.patch 
Log Message:
update to 5.2.7

php-5.2.7-tests-dashn.patch:

--- NEW FILE php-5.2.7-tests-dashn.patch ---
--- php-5.2.7/Makefile.global.orig	2008-12-05 07:37:27.000000000 +0100
+++ php-5.2.7/Makefile.global	2008-12-05 07:37:55.000000000 +0100
@@ -67,7 +67,7 @@
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Dec 2007 15:49:24 -0000	1.33
+++ .cvsignore	5 Dec 2008 19:22:20 -0000	1.34
@@ -1,4 +1 @@
-php-5.2.3
-clog
-*.tar.gz
-*.rpm
+php-5.2.7.tar.bz2


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- php.spec	24 Nov 2008 17:00:39 -0000	1.162
+++ php.spec	5 Dec 2008 19:22:20 -0000	1.163
@@ -7,13 +7,13 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.6
-Release: 7
+Version: 5.2.7
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
 
-Source0: http://www.php.net/distributions/php-%{version}.tar.gz
+Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
@@ -36,7 +36,7 @@
 Patch32: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.4-tests-dashn.patch
+Patch50: php-5.2.7-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -327,7 +327,7 @@
 %package mssql
 Summary: MSSQL database module for PHP
 Group: Development/Languages
-Requires: php-common = %{version}-%{release}
+Requires: php-common = %{version}-%{release}, php-pdo
 BuildRequires: freetds-devel
 
 %description mssql
@@ -530,6 +530,7 @@
       --with-pdo-mysql=shared,%{_prefix} \
       --with-pdo-pgsql=shared,%{_prefix} \
       --with-pdo-sqlite=shared,%{_prefix} \
+      --with-pdo-dblib=shared,%{_prefix} \
       --enable-json=shared \
       --enable-zip=shared \
       --with-readline \
@@ -613,7 +614,7 @@
 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 mssql pspell; do
+    dbase mcrypt mhash tidy pdo_dblib mssql pspell; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -631,6 +632,7 @@
 cat files.mysqli >> files.mysql
 
 # Split out the PDO modules
+cat files.pdo_dblib >> files.mssql
 cat files.pdo_mysql >> files.mysql
 cat files.pdo_pgsql >> files.pgsql
 cat files.pdo_odbc >> files.odbc
@@ -729,6 +731,10 @@
 %files pspell -f files.pspell
 
 %changelog
+* Fri Dec 05 2008 Remi Collet <Fedora at FamilleCollet.com> 5.2.7-1
+- update to 5.2.7
+- enable pdo_dblib driver in php-mssql
+
 * Mon Nov 24 2008 Joe Orton <jorton at redhat.com> 5.2.6-7
 - tweak Summary, thanks to Richard Hughes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Jul 2008 11:04:39 -0000	1.36
+++ sources	5 Dec 2008 19:22:20 -0000	1.37
@@ -1 +1 @@
-1720f95f26c506338f0dba3a51906bbd  php-5.2.6.tar.gz
+9ffc42edbb7faad965699666ddd559bc  php-5.2.7.tar.bz2


--- php-5.2.4-tests-dashn.patch DELETED ---