packages: php/php.spec - fix timezone setup in php.ini - there's nothing to...

glen glen at pld-linux.org
Thu Aug 26 19:08:31 CEST 2010


Author: glen                         Date: Thu Aug 26 17:08:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix timezone setup in php.ini
- there's nothing to ldconfig

---- Files affected:
packages/php:
   php.spec (1.892 -> 1.893) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.892 packages/php/php.spec:1.893
--- packages/php/php.spec:1.892	Thu Aug 26 19:00:17 2010
+++ packages/php/php.spec	Thu Aug 26 19:08:25 2010
@@ -449,7 +449,6 @@
 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
@@ -2350,18 +2349,15 @@
 fi
 
 %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
+		%{__sed} -i -e "s,^;date.timezone\s*=.*,date.timezone = $TIMEZONE," /etc/php/php.ini
 	fi
 fi
 
-%postun	common -p /sbin/ldconfig
-
 %posttrans common
 # minimizing apache restarts logics. we restart webserver:
 #
@@ -3154,6 +3150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.893  2010/08/26 17:08:25  glen
+- fix timezone setup in php.ini
+- there's nothing to ldconfig
+
 Revision 1.892  2010/08/26 17:00:17  glen
 - use cli makefile/config for build/install so that all install targets are invoked
 - package phar binfiles which got installed now
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.892&r2=1.893&f=u



More information about the pld-cvs-commit mailing list