packages: php-dirs/php-dirs.spec, php-dirs/php-session.sh - rel 7; use just...

[arekm]

Author: arekm                        Date: Wed Oct 28 11:10:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; use just php and not php.cli

---- Files affected:
packages/php-dirs:
   php-dirs.spec (1.17 -> 1.18) , php-session.sh (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/php-dirs/php-dirs.spec
diff -u packages/php-dirs/php-dirs.spec:1.17 packages/php-dirs/php-dirs.spec:1.18
--- packages/php-dirs/php-dirs.spec:1.17	Tue Aug 18 00:13:22 2009
+++ packages/php-dirs/php-dirs.spec	Wed Oct 28 12:10:47 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Wspólne katalogi dla różnych wersji PHP
 Name:		php-dirs
 Version:	1.1
-Release:	6
+Release:	7
 License:	GPL
 Group:		Base
 Source0:	php-session.sh
@@ -58,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/10/28 11:10:47  arekm
+- rel 7; use just php and not php.cli
+
 Revision 1.17  2009/08/17 22:13:22  arekm
 R: tmpwatch
 

================================================================
Index: packages/php-dirs/php-session.sh
diff -u packages/php-dirs/php-session.sh:1.3 packages/php-dirs/php-session.sh:1.4
--- packages/php-dirs/php-session.sh:1.3	Tue Aug 18 08:31:49 2009
+++ packages/php-dirs/php-session.sh	Wed Oct 28 12:10:47 2009
@@ -1,12 +1,12 @@
 #!/bin/sh
-if [ -x /usr/bin/php.cli ] ; then
-	RUNTIME5=$(/usr/bin/php.cli -r '$t = round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2> /dev/null)
+if [ -x /usr/bin/php ] ; then
+	RUNTIME5=$(/usr/bin/php -r '$t = round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2> /dev/null)
 elif [ -r /etc/php/php.ini ]; then
 	RUNTIME5=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/php/php.ini)
 fi
 
-if [ -x /usr/bin/php4.cli ] ; then
-	RUNTIME4=$(/usr/bin/php4.cli -r '$t = round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2> /dev/null)
+if [ -x /usr/bin/php4 ] ; then
+	RUNTIME4=$(/usr/bin/php4 -r '$t = round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2> /dev/null)
 elif [ -r /etc/php4/php.ini ]; then
 	RUNTIME4=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/php4/php.ini)
 fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-dirs/php-dirs.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-dirs/php-session.sh?r1=1.3&r2=1.4&f=u