summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-08-03 22:36:39 +0200
committerRemi Collet <remi@php.net>2023-08-03 22:36:39 +0200
commitb533fb4e96f2cbb4d164f0549d1bba0f70536cfb (patch)
tree271107b1c1b560259c1136b28826d24a2c4bd788
parente2e78c35c5f2e26ec320387aa3c2a24769b4e560 (diff)
Update to 8.0.30 - http://www.php.net/releases/8_0_30.php
move httpd/nginx wants directive to config files in /etc
-rw-r--r--failed.txt2
-rw-r--r--php80.spec14
2 files changed, 10 insertions, 6 deletions
diff --git a/failed.txt b/failed.txt
index ca61f55..6fb2547 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/php80.spec b/php80.spec
index 438ff0d..e985627 100644
--- a/php80.spec
+++ b/php80.spec
@@ -102,7 +102,7 @@
%bcond_without libgd
%bcond_with zip
-%global upver 8.0.29
+%global upver 8.0.30
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -1797,8 +1797,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
@@ -2118,8 +2118,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
@@ -2198,6 +2198,10 @@ fi
%changelog
+* Thu Aug 3 2023 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 8.0.29-1
- Update to 8.0.29 - http://www.php.net/releases/8_0_29.php