commit 4cf346446354e380df1718682c01f7be833c3957 Author: Elan Ruusamäe <g...@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 6f71036..539eb40 100644 --- a/php.spec +++ b/php.spec @@ -126,7 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define rel 3 +%define rel 4 %define orgname php %define ver_suffix 55 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -2723,7 +2723,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= @@ -2733,7 +2733,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/4cf346446354e380df1718682c01f7be833c3957 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit