summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php81.spec16
2 files changed, 11 insertions, 7 deletions
diff --git a/failed.txt b/failed.txt
index 7f01996..21dd9be 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/php81.spec b/php81.spec
index a50501d..23ad098 100644
--- a/php81.spec
+++ b/php81.spec
@@ -109,8 +109,8 @@
%bcond_without libgd
%bcond_with zip
-%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: php
@@ -1793,8 +1793,8 @@ install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d
install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/php-fpm.service
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/php-fpm.conf
-install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/php-fpm.conf
+install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/httpd.service.d/php-fpm.conf
+install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/nginx.service.d/php-fpm.conf
%endif
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
@@ -2114,8 +2114,8 @@ fi
%endif
%{_unitdir}/php-fpm.service
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-%{_unitdir}/httpd.service.d/php-fpm.conf
-%{_unitdir}/nginx.service.d/php-fpm.conf
+%config(noreplace) %{_sysconfdir}/systemd/system/httpd.service.d/php-fpm.conf
+%config(noreplace) %{_sysconfdir}/systemd/system/nginx.service.d/php-fpm.conf
%endif
%dir %{_sysconfdir}/systemd/system/php-fpm.service.d
%dir %ghost /run/php-fpm
@@ -2194,6 +2194,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