- set date.timezone only if not yet set (note by blues on pld-devel-en); rel 8

Changed files:
    php-include_path.patch -> 1.4
    php.spec -> 1.895

diff --git a/php-include_path.patch b/php-include_path.patch
index bc5755285d7a59096132106a258b05531485e6a4..a1c3afeb6c9e4bf06f6492ceb9c133a557b6608e 100644 (file)
--- a/php-include_path.patch
+++ b/php-include_path.patch
@@ -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

diff --git a/php.spec b/php.spec
index fec0809e54fba51ae852bc1ea34d674c1b27d69f..5408c1630c2c5f8e63fff09efb00ac7e2328d440 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -102,7 +102,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %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
@@ -2353,11 +2353,11 @@ fi
 
 %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