From be3fd47fb8a3702b6c9dc9fecc158bcf0d167d78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Aug 2023 22:36:03 +0200 Subject: Update to 8.0.30 - http://www.php.net/releases/8_0_30.php move httpd/nginx wants directive to config files in /etc --- failed.txt | 2 +- php.spec | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/failed.txt b/failed.txt index 2820935..6b538aa 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.0.29 (2023-06-08) +===== 8.0.30 (2023-08-03) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php.spec b/php.spec index cf6ccb7..2a4d07f 100644 --- a/php.spec +++ b/php.spec @@ -114,7 +114,7 @@ #global gh_date 20200615 %global gh_owner php %global gh_project php-src -%global upver 8.0.29 +%global upver 8.0.30 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -1464,9 +1464,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default . # install systemd unit files and scripts for handling server startup install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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 -sed -e 's/php-fpm/%{?scl_prefix}php-fpm/' -i $RPM_BUILD_ROOT%{_unitdir}/*.service.d/%{?scl_prefix}php-fpm.conf +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/httpd.service.d/%{?scl_prefix}php-fpm.conf +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/nginx.service.d/%{?scl_prefix}php-fpm.conf +sed -e 's/php-fpm/%{?scl_prefix}php-fpm/' -i $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/*.service.d/%{?scl_prefix}php-fpm.conf %endif sed -e 's:/run:%{_localstatedir}/run:' \ -e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \ @@ -1776,8 +1776,8 @@ fi %{_unitdir}/%{?scl_prefix}php-fpm.service %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf -%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf +%config(noreplace) %{_root_sysconfdir}/systemd/system/httpd.service.d/%{?scl_prefix}php-fpm.conf +%config(noreplace) %{_root_sysconfdir}/systemd/system/nginx.service.d/%{?scl_prefix}php-fpm.conf %endif %{_sbindir}/php-fpm %dir %{_sysconfdir}/php-fpm.d @@ -1854,6 +1854,10 @@ fi %changelog +* Thu Aug 3 2023 Remi Collet - 8.0.30-1 +- Update to 8.0.30 - http://www.php.net/releases/8_0_30.php +- move httpd/nginx wants directive to config files in /etc + * Thu Jun 8 2023 Remi Collet - 8.0.29-1 - Update to 8.0.29 - http://www.php.net/releases/8_0_29.php -- cgit