From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 21 Aug 2018 18:35:29 +0000 (+0000)
Subject: - merged 1.10 from PLD
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=6a30d02c2a3009fa3e0d2bd3e08b9c785f2ac312;p=packages%2Fphp-dirs.git

- merged 1.10 from PLD
---

diff --git a/crontab b/crontab
index c5d1969..503d36a 100644
--- a/crontab
+++ b/crontab
@@ -1,3 +1,3 @@
 MAILTO=root
 
-01 * * * * root /usr/lib/php-session.sh
+01 * * * * root @libexecdir@/php-session.sh
diff --git a/php-dirs.spec b/php-dirs.spec
index ce88831..f5730f1 100644
--- a/php-dirs.spec
+++ b/php-dirs.spec
@@ -1,11 +1,11 @@
 # TODO
-# - move tmpwatch S: to php-session package (as session files file storage no
+# - move tmpwatch R: to php-session package (as session files file storage no
 #   longer can cleanup itself due dir perms)
 # - https://fedorahosted.org/tmpwatch/ticket/7 is implemented in tmpwatch-2.9.16, see 3467603 todo
 Summary:	Common dirs for PHP
 Summary(pl.UTF-8):	Wspólne katalogi dla PHP
 Name:		php-dirs
-Version:	1.7
+Version:	1.10
 Release:	1
 License:	GPL
 Group:		Base
@@ -15,7 +15,7 @@ BuildRequires:	rpmbuild(macros) >= 1.644
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
-Suggests:	tmpwatch
+Requires:	tmpwatch
 Conflicts:	php-pear < 4:1.4-2
 Provides:	group(http)
 BuildArch:	noarch
@@ -38,7 +38,15 @@ install -d $RPM_BUILD_ROOT{/etc/cron.d,/var/{cache,log,run}/php,/var/log/archive
 	$RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{php_data_dir}
 
 install -p %{SOURCE0} $RPM_BUILD_ROOT%{_libexecdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/php-session
+sed -e 's,@libexecdir@,%{_libexecdir},' %{SOURCE1} >$RPM_BUILD_ROOT/etc/cron.d/php-session
+
+while read dir; do
+	install -d $RPM_BUILD_ROOT$dir
+done <<EOF
+%{php_data_dir}/tests
+%{php_data_dir}/Symfony/Bridge
+%{php_data_dir}/Symfony/Component
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +63,7 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/php-session
 %attr(755,root,root) %{_libexecdir}/php-session.sh
+
 %dir %{_docdir}/phpdoc
 %dir %{_includedir}/php
 %dir %{php_data_dir}
diff --git a/php-session.sh b/php-session.sh
index d7bc1a7..19bffe2 100755
--- a/php-session.sh
+++ b/php-session.sh
@@ -23,7 +23,7 @@ cleanup_dir() {
 find_gc_time() {
 	gc_time=0
 	local gc php
-	for php in php php4 php52 php53 php54 php55 php56; do
+	for php in php $(cd /usr/bin && ls -1 php[0-9] php[0-9][0-9] 2> /dev/null); do
 		gc=
 		if [ -x /usr/bin/$php ]; then
 			gc=$($php -r 'echo max(round(ini_get("session.gc_maxlifetime")/3600), 1);' 2> /dev/null)