commit dbdace4cffe7c0b88393d2602d77d2a0771f7875
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 90a2778..7b82cf9 100644
--- a/php.spec
+++ b/php.spec
@@ -144,7 +144,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 7.0.11
-Release: 1
+Release: 2
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -2707,7 +2707,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=
@@ -2717,7 +2717,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/dbdace4cffe7c0b88393d2602d77d2a0771f7875
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
