[packages/php/PHP_5_6] setup timezone in %posttrans, not %post

glen glen at pld-linux.org
Tue Oct 4 14:40:46 CEST 2016


commit 1ac94d74bf86539440a5ddc3e6fddd8cca07c7a5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Oct 4 15:38:32 2016 +0300

    setup timezone in %posttrans, not %post
    
    this ensures that php.ini timezone is actually set if php and tzdata
    pacakge are installed in same transaction

 php.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 5f8bb3a..2a1e72c 100644
--- a/php.spec
+++ b/php.spec
@@ -149,7 +149,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	1
+%define		rel	2
 %define		orgname	php
 %define		ver_suffix 56
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -2818,7 +2818,7 @@ fi
 %post	embedded -p /sbin/ldconfig
 %postun	embedded -p /sbin/ldconfig
 
-%post common
+%posttrans 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=
@@ -2828,7 +2828,6 @@ if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/s
 	fi
 fi
 
-%posttrans common
 # minimizing apache restarts logics. we restart webserver:
 #
 # 1. at the end of transaction. (posttrans, feature from rpm 4.4.2)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/1ac94d74bf86539440a5ddc3e6fddd8cca07c7a5



More information about the pld-cvs-commit mailing list