packages: php/php-include_path.patch, php/php.spec - set date.timezone only...

[glen]

Author: glen                         Date: Thu Aug 26 22:04:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- set date.timezone only if not yet set (note by blues on pld-devel-en); rel 8

---- Files affected:
packages/php:
   php-include_path.patch (1.3 -> 1.4) , php.spec (1.894 -> 1.895) 

---- Diffs:

================================================================
Index: packages/php/php-include_path.patch
diff -u packages/php/php-include_path.patch:1.3 packages/php/php-include_path.patch:1.4
--- packages/php/php-include_path.patch:1.3	Sat Feb 20 01:35:25 2010
+++ packages/php/php-include_path.patch	Fri Aug 27 00:04:15 2010
@@ -1,11 +1,11 @@
---- php-5.2.8/configure.in~	2008-12-16 22:27:12.000000000 +0200
-+++ php-5.2.8/configure.in	2008-12-17 16:13:05.619902948 +0200
-@@ -1136,7 +1136,7 @@
+--- php-5.2.0/configure.in.includedir
++++ php-5.2.0/configure.in
+@@ -1101,7 +1101,7 @@
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
 -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:/usr/share/php
++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.894 packages/php/php.spec:1.895
--- packages/php/php.spec:1.894	Thu Aug 26 19:11:25 2010
+++ packages/php/php.spec	Fri Aug 27 00:04:15 2010
@@ -103,7 +103,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		7
+%define		rel		8
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -2354,11 +2354,11 @@
 
 %post common
 # PHP 5.3 requires timezone being setup, try setup it from tzdata
-if [ -f /etc/sysconfig/timezone ]; then
+if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/sysconfig/timezone ]; then
 	TIMEZONE=
 	. /etc/sysconfig/timezone
 	if [ "$TIMEZONE" ]; then
-		%{__sed} -i -e "s,^;date.timezone\s*=.*,date.timezone = $TIMEZONE," /etc/php/php.ini
+		%{__sed} -i -e "s,^;date.timezone[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/php.ini
 	fi
 fi
 
@@ -3154,6 +3154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.895  2010/08/26 22:04:15  glen
+- set date.timezone only if not yet set (note by blues on pld-devel-en); rel 8
+
 Revision 1.894  2010/08/26 17:11:25  glen
 - use system tzdata patch from fedora
 - php common lib smaller by 275k and tzdata info up to date regardless of php releases
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-include_path.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.894&r2=1.895&f=u