Revert "use "System/Localtime" tzname (which uses /etc/localtime) if configuration...

This reverts commit 6aa905153af8c6e0b011740bc328c3360c963d23.

diff --git a/php.spec b/php.spec
index e1d243d89bfd5984520dc79f25eb2ccb45925f1a..4b93a843d6a9cf5d71d5fdb8547a4ed18c3e5a87 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -2533,15 +2533,12 @@ fi
 
 %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
+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[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/php.ini
        fi
-
-       %{__sed} -i -e "s,^;date.timezone[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/php.ini
 fi
 
 %posttrans common