- rel 6; use /var/run/php-ug for session files (because /var/run/php/ug gets deleted...

diff --git a/apache-mod_mpm_itk-php.conf b/apache-mod_mpm_itk-php.conf
index 7d51d5677b0edbcfb7c2df065cf99d00d9f364a2..111bcb53ef5da14b8190e27c7645d366b4a863f4 100644 (file)
--- a/apache-mod_mpm_itk-php.conf
+++ b/apache-mod_mpm_itk-php.conf
@@ -1,10 +1,10 @@
 # different settings when ITK in use
 
 <IfModule mod_php5.c>
-php_value session.save_path "/var/run/php/ug"
+php_value session.save_path "/var/run/php-ug"
 </IfModule>
 
 <IfModule sapi_apache2.c>
-php_value session.save_path "/var/run/php/ug"
+php_value session.save_path "/var/run/php-ug"
 </IfModule>
 

diff --git a/apache-mod_mpm_itk.spec b/apache-mod_mpm_itk.spec
index 4a804c7fd825f8292a98ae7601858246326c8ccf..c826a4c544ee068d454d8e9518090ef416c91749 100644 (file)
--- a/apache-mod_mpm_itk.spec
+++ b/apache-mod_mpm_itk.spec
@@ -5,7 +5,7 @@
 Summary:       mod_mpm_itk - allows you to run each of your vhost under a separate uid and gid
 Name:          apache-mod_mpm_itk
 Version:       %{ver}.%{subver}
-Release:       5
+Release:       6
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://mpm-itk.sesse.net/mpm-itk-%{ver}-%{subver}.tar.gz
@@ -21,7 +21,7 @@ BuildRequires:        apr-util-devel >= 1:1.0
 BuildRequires: libcap-devel
 Requires:      apache(modules-api) = %{apache_modules_api}
 Requires:      apache-base >= 2.4.7
-Requires:      php-dirs
+Requires:      php-dirs >= 1.5-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -53,7 +53,7 @@ extra fork per request.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir},%{_sysconfdir}/conf.d}
-install -d $RPM_BUILD_ROOT{/var/run/php/ug,%{systemdtmpfilesdir}}
+install -d $RPM_BUILD_ROOT{/var/run/php-ug,%{systemdtmpfilesdir}}
 
 install -p .libs/mpm_itk.so $RPM_BUILD_ROOT%{_pkglibdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/10_mod_%{mod_name}.conf
@@ -79,5 +79,5 @@ fi
 %attr(755,root,root) %{_pkglibdir}/mpm_itk.so
 %{systemdtmpfilesdir}/php-itk-dirs.conf
 # multiple uid/gids in use
-%dir %attr(1773,root,root) /var/run/php/ug
+%dir %attr(1773,root,root) /var/run/php-ug
 

diff --git a/apache-mod_mpm_itk.tmpfiles b/apache-mod_mpm_itk.tmpfiles
index 14ee51f6496867d49dc48c141f3fa65133769625..869d906936019ac2d09be6b95ca2c682850cb000 100644 (file)
--- a/apache-mod_mpm_itk.tmpfiles
+++ b/apache-mod_mpm_itk.tmpfiles
@@ -1 +1 @@
-d /var/run/php/ug 1773 root root -
+d /var/run/php-ug 1773 root root -