From d3d6c8db43f4bb03e505a7409c263608f7d7dcdb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 21 Aug 2024 16:08:44 +0200
Subject: Wizard: + F41

---
 wizard/index.php | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

(limited to 'wizard')

diff --git a/wizard/index.php b/wizard/index.php
index c9692aa0..fa1af677 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -26,6 +26,7 @@ $osvers = [
     'EL 9'      => ['8.0', '8.1', '8.2'],
     'EL 8'      => ['7.4', '8.0', '8.2'],
 //  'EL 7'      => '5.4',
+    'Fedora 41' => '8.3',
     'Fedora 40' => '8.3',
     'Fedora 39' => '8.2',
 ];
@@ -39,6 +40,7 @@ $osmin = [
     'EL 9'      => '7.4',
     'EL 8'      => '5.6',
 //   'EL 7'      => '5.4',
+    'Fedora 41' => '7.4',
     'Fedora 40' => '7.4',
     'Fedora 39' => '7.4',
 ];
@@ -52,6 +54,7 @@ $osminbase = [
     'EL 9'      => '7.4',
     'EL 8'      => '7.2',
 //  'EL 7'      => '5.4',
+    'Fedora 41' => '7.4',
     'Fedora 40' => '7.4',
     'Fedora 39' => '7.4',
 ];
@@ -65,6 +68,7 @@ $osmax = [
     'EL 9'      => '8.4',
     'EL 8'      => '8.4',
 //  'EL 7'      => '8.3',
+    'Fedora 41' => '8.4',
     'Fedora 40' => '8.4',
     'Fedora 39' => '8.4',
 ];
@@ -82,6 +86,7 @@ $osname = [
 		'EL 8'      => 'EL 8',
 //		'EL 7'      => 'EL 7 (maintained until June 30, 2024)',
 	':fedora'		=> 'Fedora Linux',
+		'Fedora 41' => 'Fedora 41 (development version)',
 		'Fedora 40' => 'Fedora 40',
 		'Fedora 39' => 'Fedora 39',
 ];
@@ -270,14 +275,16 @@ if ($arch == 'ppc64le' || $arch == 's390x') {
 
 if ($php && $os && $type && !$err) {
     if ($dist == 'Fedora') {
-		$mod = ($ver >= 29);
+		$mod  = ($ver >= 29);
+		$dnf5 = ($ver >= 41);
         $yum = 'dnf';
         printf("<li>Command to install the Remi repository configuration package:");
         printf("<pre>    $yum install https://rpms.remirepo.net/fedora/remi-release-%d.rpm</pre>", $ver);
         printf("</li><br />");
     
     } else {
-		$mod = ($ver >= 8);
+		$mod  = ($ver >= 8);
+		$dnf5 = false;
 		if ($ver >= 8) {
 	        $yum = 'dnf';
 		} else {
@@ -357,13 +364,32 @@ if ($php && $os && $type && !$err) {
             if ($mod) {
                 printf("<li>PHP version <b>%s</b> packages are available for <b>%s</b> in <b>remi-modular</b> repository</li><br />", $php, $os);
 
-                printf("<li>You have to enable the module stream for $php, and update the old version if installed:");
-                printf("<pre>    dnf module switch-to php:remi-%s</pre>", $php);
-                printf("</li><br />");
-
-		        printf("<li>If no version is installed, command to <b>install</b> the php stream default profile:");
-                printf("<pre>    dnf module install php:remi-%s</pre>", $php);
-		        printf("</li><br />");
+				if ($dnf5) { // dnf v5 have minimal support for modularity https://bugzilla.redhat.com/2305955
+		            printf("<li>You have to enable the module stream for $php:");
+		            printf("<pre>    dnf module reset php</pre>");
+		            printf("<pre>    dnf module enable php:remi-%s</pre>", $php);
+		            printf("</li><br />");
+
+				    printf("<li>If no version is installed, command to <b>install</b> the php stream default profile:");
+		            printf("<pre>    dnf install php-cli php-fpm php-mbstring php-xml</pre>");
+				    printf("</li><br />");
+
+				    printf("<li>If an older version is installed, command to <b>upgrade</b> the php stack:");
+		            printf("<pre>    dnf update</pre>");
+				    printf("</li><br />");
+
+				    printf("<li>If an newer version is installed, command to <b>downgrade</b> the php stack:");
+		            printf("<pre>    dnf downgrade php-common</pre>");
+				    printf("</li><br />");
+				} else {
+		            printf("<li>You have to enable the module stream for $php, and update the old version if installed:");
+		            printf("<pre>    dnf module switch-to php:remi-%s</pre>", $php);
+		            printf("</li><br />");
+
+				    printf("<li>If no version is installed, command to <b>install</b> the php stream default profile:");
+		            printf("<pre>    dnf module install php:remi-%s</pre>", $php);
+				    printf("</li><br />");
+				}
             } else {
                 printf("<li>PHP version <b>%s</b> packages are available for <b>%s</b> in <b>%s</b> repository</li><br />", $php, $os, $repo);
 	            printf("<li>Command to enable the repository:");
-- 
cgit