[packages/php/PHP_5_2] Revert "use "System/Localtime" tzname (which uses /etc/localtime) if configuration can not be found"

glen glen at pld-linux.org
Thu Aug 16 19:55:11 CEST 2012


commit 0381c8b4bfd21bbbc1e8a25a2c8b8ae34505996f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 16 20:54:36 2012 +0300

    Revert "use "System/Localtime" tzname (which uses /etc/localtime) if configuration can not be found"
    
    This reverts commit 880718391a5fde8097dae122100efab36cb3023e.

 php.spec | 13 -------------
 1 file changed, 13 deletions(-)
---
diff --git a/php.spec b/php.spec
index c89140f..9621f48 100644
--- a/php.spec
+++ b/php.spec
@@ -2577,19 +2577,6 @@ fi
 %post	common -p /sbin/ldconfig
 %postun	common -p /sbin/ldconfig
 
-%post common
-# PHP 5.3 requires timezone being setup, try setup it from tzdata
-if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini; then
-	if [ -f /etc/sysconfig/timezone ]; then
-		TIMEZONE=
-		. /etc/sysconfig/timezone
-	else
-		TIMEZONE=System/Localtime
-	fi
-
-	%{__sed} -i -e "s,^;date.timezone[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/php.ini
-fi
-
 %posttrans common
 # minimizing apache restarts logics. we restart webserver:
 #


More information about the pld-cvs-commit mailing list