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

glen glen at pld-linux.org
Fri Aug 10 08:41:57 CEST 2012


commit e84b92a40b7768668729da7f3ffeddb05b8dd7fc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Aug 10 09:39:29 2012 +0300

    use "System/Localtime" tzname (which uses /etc/localtime) if configuration can not be found

 php.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/php.spec b/php.spec
index 18144ca..2f26b2a 100644
--- a/php.spec
+++ b/php.spec
@@ -2536,12 +2536,15 @@ fi
 
 %post common
 # PHP 5.3 requires timezone being setup, try setup it from tzdata
-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
+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


More information about the pld-cvs-commit mailing list