From efcebb0e3adbd819a1752148929c7bb9074b90fd Mon Sep 17 00:00:00 2001
From: Remi Collet <rcollet@redhat.com>
Date: Thu, 23 Oct 2025 09:41:45 +0200
Subject: [PATCH] fix tmpfiles.d configuration file name

use php8.4 as component for CI

Resolves: RHEL-105827
---
 php.spec                 | 13 ++++++++-----
 plans/tier1-internal.fmf |  2 +-
 plans/tier2-internal.fmf |  2 +-
 plans/tier3-internal.fmf |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/php.spec b/php.spec
index ea3cbad..0637554 100644
--- a/php.spec
+++ b/php.spec
@@ -71,7 +71,7 @@ Name: php%{major_version}
 Name: php
 %endif
 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
@@ -1304,7 +1304,7 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php/preload
 
 # Install tmpfiles.d file
-install -p -D -m 0644 %{SOURCE15} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -p -D -m 0644 %{SOURCE15} %{buildroot}%{_tmpfilesdir}/php.conf
 
 %if %{with modphp}
 # install the DSO
@@ -1514,7 +1514,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
 %attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
 %config(noreplace) %{_httpd_confdir}/php.conf
-%{_tmpfilesdir}/%{name}.conf
+%{_tmpfilesdir}/php.conf
 %endif
 
 %files common -f files.common
@@ -1589,7 +1589,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %{_mandir}/man8/php-fpm.8*
 %dir %{_datadir}/fpm
 %{_datadir}/fpm/status.html
-%{_tmpfilesdir}/%{name}.conf
+%{_tmpfilesdir}/php.conf
 
 %files devel
 %{_bindir}/php-config
@@ -1650,11 +1650,14 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Thu Oct 23 2025 Remi Collet <remi@remirepo.net> - 8.4.15-1
+- fix tmpfiles.d configuration file name
+
 * Wed Oct 22 2025 Remi Collet <remi@remirepo.net> - 8.4.14-1
 - Update to 8.4.14 - http://www.php.net/releases/8_4_14.php
 
 * Tue Oct 21 2025 Remi Collet <remi@remirepo.net> - 8.4.13-2
-- add tmpfiles.d configuration file fir ImageMode
+- add tmpfiles.d configuration file for ImageMode
 
 * Wed Sep 24 2025 Remi Collet <remi@remirepo.net> - 8.4.13-1
 - Update to 8.4.13 - http://www.php.net/releases/8_4_13.php
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
index a14c852..7283b52 100644
--- a/plans/tier1-internal.fmf
+++ b/plans/tier1-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier1 beakerlib tests
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/php
-    filter: "tier:1&component:php"
+    filter: "tier:1&component:php8.4"
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier2-internal.fmf b/plans/tier2-internal.fmf
index 7a2ecd1..49f97ab 100644
--- a/plans/tier2-internal.fmf
+++ b/plans/tier2-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier2 beakerlib tests
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/php
-    filter: "tier:2&component:php"
+    filter: "tier:2&component:php8.4"
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier3-internal.fmf b/plans/tier3-internal.fmf
index 4c024a6..d849735 100644
--- a/plans/tier3-internal.fmf
+++ b/plans/tier3-internal.fmf
@@ -2,7 +2,7 @@ summary: Internal Tier3 beakerlib tests
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/php
-    filter: "tier:3&component:php"
+    filter: "tier:3&component:php8.4"
 execute:
     how: tmt
 adjust: