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

This reverts commit e84b92a40b7768668729da7f3ffeddb05b8dd7fc.

diff --git a/php.spec b/php.spec
index 2f26b2a9ee11f8339f4881ce28de0bdda020135a..18144cae0f6ac7bd728b5d42d5e85677744eaf5d 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -2536,15 +2536,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