diff options
| author | Remi Collet <remi@remirepo.net> | 2017-09-25 15:11:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-09-25 15:11:26 +0200 |
| commit | 263026feaebddf8facd324e9136efbe04803cf86 (patch) | |
| tree | b0f51f5917350c4f00a1843a463c00ecf2549305 /php.spec | |
| parent | c79ad36f7e8aa0e130649a6cbb29eccb580c5e5c (diff) | |
F27: php now requires php-fpm and start it with httpd / nginx
Diffstat (limited to 'php.spec')
| -rw-r--r-- | php.spec | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -126,7 +126,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -152,6 +152,7 @@ Source8: php-fpm.sysconfig Source9: php.modconf Source10: php.conf2 Source11: php-fpm.init +Source12: php-fpm.wants # Configuration files for some extensions Source50: 10-opcache.ini Source51: opcache-default.blacklist @@ -303,6 +304,10 @@ Requires(pre): httpd-filesystem # and version 2.4.10 for proxy support in SetHandler Requires: httpd-filesystem >= 2.4.10 %endif +%if 0%{?fedora} >= 27 +# httpd have threaded MPM by default +Requires: %{?scl_prefix}php-fpm%{?_isa} = %{version}-%{release} +%endif %description fpm PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI @@ -1394,8 +1399,11 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default . # install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/php-fpm.conf # install systemd unit files and scripts for handling server startup %if %{with_systemd} -install -m 755 -d $RPM_BUILD_ROOT%{_unitdir} -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service +install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service +%if 0%{?fedora} >= 27 +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf +%endif sed -e 's:/run:%{_localstatedir}/run:' \ -e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \ -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ @@ -1721,6 +1729,10 @@ fi # {_prefix}/lib/tmpfiles.d/php-fpm.conf %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service +%if 0%{?fedora} >= 27 +%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf +%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf +%endif %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d %else %{_root_initddir}/%{?scl_prefix}php-fpm @@ -1811,6 +1823,9 @@ fi %changelog +* Mon Sep 25 2017 Remi Collet <remi@remirepo.net> - 7.1.10~RC1-3 +- F27: php now requires php-fpm and start it with httpd / nginx + * Thu Sep 14 2017 Remi Collet <remi@remirepo.net> - 7.1.10~RC1-2 - update builder from RHEL 7.3 to RHEL 7.4 |