diff options
| -rw-r--r-- | php-fpm.wants | 3 | ||||
| -rw-r--r-- | php.spec | 24 |
2 files changed, 23 insertions, 4 deletions
diff --git a/php-fpm.wants b/php-fpm.wants new file mode 100644 index 0000000..b1f26a8 --- /dev/null +++ b/php-fpm.wants @@ -0,0 +1,3 @@ +[Unit] +Wants=php72-php-fpm.service + @@ -129,8 +129,8 @@ #global gh_date 20170828 %global gh_owner php %global gh_project php-src -%global rcver RC2 -%global rpmrel 24 +%global rcver RC3 +%global rpmrel 25 Summary: PHP scripting language for creating dynamic web sites @@ -166,6 +166,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 @@ -245,6 +246,10 @@ Requires(pre): httpd-filesystem %else Requires(pre): httpd %endif +%if 0%{?fedora} >= 27 +# httpd have threaded MPM by default +Requires: %{?scl_prefix}php-fpm%{?_isa} = %{version}-%{release} +%endif # Don't provides extensions, or shared libraries (embedded) @@ -1426,8 +1431,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:' \ @@ -1752,6 +1760,10 @@ fi %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d +%if 0%{?fedora} >= 27 +%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf +%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf +%endif %else %{_root_initddir}/%{?scl_prefix}php-fpm %endif @@ -1839,6 +1851,10 @@ fi %changelog +* Mon Sep 25 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.25.RC3* +- RC3 test build +- F27: php now requires php-fpm and start it with httpd / nginx + * Thu Sep 14 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.24.RC2 - update builder from RHEL 7.3 to RHEL 7.4 |