From d38ef62b1adc579ab0dd228bae18a4b50a5e5f52 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 17 Nov 2025 08:41:12 +0100
Subject: move httpd/nginx drop-ins back to /usr/lib/systemd/system #2415127

---
 php-fpm.wants |  9 +++++++++
 php85.spec    | 13 ++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/php-fpm.wants b/php-fpm.wants
index 5c7c8e4..2b4e775 100644
--- a/php-fpm.wants
+++ b/php-fpm.wants
@@ -1,3 +1,12 @@
+# This file provides default configuration and will be overwritten on package upgrades.
+# Do not edit it directly.
+#
+# To customize:
+#   1. Copy this file, preserving its name, to /etc/systemd/system/<unit>.d/
+#      (create the directory if it does not exist)
+#   2. Edit the copy as needed
+#   3. Run: systemctl daemon-reload
+
 [Unit]
 Wants=php-fpm.service
 
diff --git a/php85.spec b/php85.spec
index 3807d10..6c0a217 100644
--- a/php85.spec
+++ b/php85.spec
@@ -94,7 +94,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -1567,8 +1567,8 @@ install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
 # this folder requires systemd >= 204
 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
-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
+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
 
 # Nginx configuration
 install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
@@ -1802,8 +1802,8 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
 %config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
 %{_unitdir}/php-fpm.service
-%config(noreplace) %{_sysconfdir}/systemd/system/httpd.service.d/php-fpm.conf
-%config(noreplace) %{_sysconfdir}/systemd/system/nginx.service.d/php-fpm.conf
+%{_unitdir}/httpd.service.d/php-fpm.conf
+%{_unitdir}/nginx.service.d/php-fpm.conf
 %dir %{_sysconfdir}/systemd/system/php-fpm.service.d
 %dir %ghost /run/php-fpm
 %{_sbindir}/php-fpm
@@ -1869,6 +1869,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Mon Nov 17 2025 Remi Collet <remi@remirepo.net> - 8.5.0~RC5-2
+- move httpd/nginx drop-ins back to /usr/lib/systemd/system #2415127
+
 * Wed Nov 12 2025 Remi Collet <remi@remirepo.net> - 8.5.0~RC5-1
 - update to 8.5.0RC5
 
-- 
cgit