Author: glen Date: Tue Aug 24 21:45:29 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix second post
---- Files affected:
packages/php:
php.spec (1.890 -> 1.891)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.890 packages/php/php.spec:1.891
--- packages/php/php.spec:1.890 Tue Aug 24 13:01:52 2010
+++ packages/php/php.spec Tue Aug 24 23:45:24 2010
@@ -103,7 +103,7 @@
%undefine with_filter
%endif
-%define rel 5
+%define rel 6
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -449,6 +449,7 @@
Summary(uk.UTF-8): Бібліотеки спільного використання для PHP
Group: Libraries
Requires(post): sed >= 4.0
+Requires(post): /sbin/ldconfig
# because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
Requires: glibc >= 6:2.3.5
Requires: php-dirs
@@ -2311,16 +2312,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post common
-# PHP 5.3 requires timezone being setup, try setup it from tzdata
-if [ -f /etc/sysconfig/timezone ]; then
- TIMEZONE=
- . /etc/sysconfig/timezone
- if [ "$TIMEZONE" ]; then
- %{__sed} -i -e "s,^;date.timezone = .*,date.timezone =
$TIMEZONE," /etc/php/php.ini
- fi
-fi
-
%post -n apache1-mod_php
if [ "$1" = "1" ]; then
%service -q apache restart
@@ -2359,7 +2350,17 @@
%userremove http
fi
-%post common -p /sbin/ldconfig
+%post common
+/sbin/ldconfig
+# PHP 5.3 requires timezone being setup, try setup it from tzdata
+if [ -f /etc/sysconfig/timezone ]; then
+ TIMEZONE=
+ . /etc/sysconfig/timezone
+ if [ "$TIMEZONE" ]; then
+ %{__sed} -i -e "s,^;date.timezone = .*,date.timezone =
$TIMEZONE," /etc/php/php.ini
+ fi
+fi
+
%postun common -p /sbin/ldconfig
%posttrans common
@@ -3152,6 +3153,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.891 2010/08/24 21:45:24 glen
+- fix second post
+
Revision 1.890 2010/08/24 11:01:52 glen
- setup date.timezone if possible; rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.890&r2=1.891&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
