- 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

Changed files:
    php-dirs.spec -> 1.19
    php-session.sh -> 1.5

diff --git a/php-dirs.spec b/php-dirs.spec
index 1339b02450929f906e21a7e97fd26d0c66e2b5c6..ab97e98bfe8125580876331f58227a952f9e65ee 100644 (file)
--- a/php-dirs.spec
+++ b/php-dirs.spec
@@ -2,7 +2,7 @@ Summary:        Common dirs for different PHP versions
 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
@@ -10,7 +10,7 @@ BuildRequires:        rpmbuild(macros) >= 1.461
 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)

diff --git a/php-session.sh b/php-session.sh
index 4575ed7a6a6e5cb9f8e2b862d582c05577c82024..bf3000127db431175724b922b6f9674df8527ffd 100644 (file)
--- a/php-session.sh
+++ b/php-session.sh
@@ -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)