From 8b4a4433adc15e46484a821c310d5a7b1f337f53 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Jul 2023 09:14:55 +0200
Subject: update to 8.1.22RC1

move httpd/nginx wants directive to config files in /etc
---
 failed.txt |  2 +-
 php.spec   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/failed.txt b/failed.txt
index 7232593..27b91a6 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.1.21 (2023-07-06)
+===== 8.1.22RC1 (2023-07-20)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php.spec b/php.spec
index f503f3c..abb2381 100644
--- a/php.spec
+++ b/php.spec
@@ -122,8 +122,8 @@
 #global gh_date      20210809
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.1.21
-#global rcver        RC1
+%global upver        8.1.22
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -1461,9 +1461,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:' \
@@ -1773,8 +1773,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
@@ -1851,6 +1851,10 @@ fi
 
 
 %changelog
+* Wed Jul 19 2023 Remi Collet <remi@remirepo.net> - 8.1.22~RC1-1
+- update to 8.1.22RC1
+- move httpd/nginx wants directive to config files in /etc
+
 * Wed Jul  5 2023 Remi Collet <remi@remirepo.net> - 8.1.21-1
 - Update to 8.1.21 - http://www.php.net/releases/8_1_21.php
 
-- 
cgit