packages: php-dirs/php-dirs.spec, php-dirs/php-session.sh - do not R fuckin...

[gotar]

Author: gotar                        Date: Thu Jan 21 18:34:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not R fucking tmpwatch!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  not in package R by php itself, do it in php-tmpwatch/tmpwatch-php or any
  other subpackage that would not be forced into my system

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

---- Diffs:

================================================================
Index: packages/php-dirs/php-dirs.spec
diff -u packages/php-dirs/php-dirs.spec:1.18 packages/php-dirs/php-dirs.spec:1.19
--- packages/php-dirs/php-dirs.spec:1.18	Wed Oct 28 12:10:47 2009
+++ packages/php-dirs/php-dirs.spec	Thu Jan 21 19:33:57 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Wspólne katalogi dla różnych wersji PHP
 Name:		php-dirs
 Version:	1.1
-Release:	7
+Release:	8
 License:	GPL
 Group:		Base
 Source0:	php-session.sh
@@ -11,7 +11,7 @@
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
-Requires:	tmpwatch
+Suggests:	tmpwatch
 Provides:	group(http)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,6 +58,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/01/21 18:33:57  gotar
+- do not R fucking tmpwatch!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+  not in package R by php itself, do it in php-tmpwatch/tmpwatch-php or any
+  other subpackage that would not be forced into my system
+
 Revision 1.18  2009/10/28 11:10:47  arekm
 - rel 7; use just php and not php.cli
 

================================================================
Index: packages/php-dirs/php-session.sh
diff -u packages/php-dirs/php-session.sh:1.4 packages/php-dirs/php-session.sh:1.5
--- packages/php-dirs/php-session.sh:1.4	Wed Oct 28 12:10:47 2009
+++ packages/php-dirs/php-session.sh	Thu Jan 21 19:33:57 2010
@@ -1,11 +1,14 @@
 #!/bin/sh
-if [ -x /usr/bin/php ] ; then
+
+[ -x /usr/sbin/tmpwatch ] || exit
+
+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 ] ; then
+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)
================================================================

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