F40 is closedHEADmaster

5 files changed, 37 insertions, 119 deletions

diff --git a/buildfct b/buildfct
index 9cfa5fa..d679293 100644
--- a/buildfct
+++ b/buildfct
@@ -5,45 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
 
 mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 
-alias mockfc39x="                mock --configdir=$mocketc -r fc39x               rebuild "
-alias mockfc39x74="              mock --configdir=$mocketc -r fc39x74             rebuild "
-alias mockfc39x80="              mock --configdir=$mocketc -r fc39x80             rebuild "
-alias mockfc39x81="              mock --configdir=$mocketc -r fc39x81             rebuild "
-alias mockfc39x82="              mock --configdir=$mocketc -r fc39x82             rebuild "
-alias mockfc39x83="              mock --configdir=$mocketc -r fc39x83             rebuild "
-alias mockfc39x84="              mock --configdir=$mocketc -r fc39x84             rebuild "
-alias mockfc39xscl74="           mock --configdir=$mocketc -r fc39xscl74          rebuild "
-alias mockfc39xscl80="           mock --configdir=$mocketc -r fc39xscl80          rebuild "
-alias mockfc39xscl81="           mock --configdir=$mocketc -r fc39xscl81          rebuild "
-alias mockfc39xscl82="           mock --configdir=$mocketc -r fc39xscl82          rebuild "
-alias mockfc39xscl83="           mock --configdir=$mocketc -r fc39xscl83          rebuild "
-alias mockfc39xscl84="           mock --configdir=$mocketc -r fc39xscl84          rebuild "
-alias mockfc39xr60="             mock --configdir=$mocketc -r fc39xr60            rebuild "
-alias mockfc39xr62="             mock --configdir=$mocketc -r fc39xr62            rebuild "
-alias mockfc39xr70="             mock --configdir=$mocketc -r fc39xr70            rebuild "
-alias mockfc39xr72="             mock --configdir=$mocketc -r fc39xr72            rebuild "
-alias mockfc39xm="               mock --configdir=$mocketc -r fc39xm              rebuild "
-
-alias mockfc40x="                mock --configdir=$mocketc -r fc40x               rebuild "
-alias mockfc40x74="              mock --configdir=$mocketc -r fc40x74             rebuild "
-alias mockfc40x80="              mock --configdir=$mocketc -r fc40x80             rebuild "
-alias mockfc40x81="              mock --configdir=$mocketc -r fc40x81             rebuild "
-alias mockfc40x82="              mock --configdir=$mocketc -r fc40x82             rebuild "
-alias mockfc40x83="              mock --configdir=$mocketc -r fc40x83             rebuild "
-alias mockfc40x84="              mock --configdir=$mocketc -r fc40x84             rebuild "
-alias mockfc40xscl74="           mock --configdir=$mocketc -r fc40xscl74          rebuild "
-alias mockfc40xscl80="           mock --configdir=$mocketc -r fc40xscl80          rebuild "
-alias mockfc40xscl81="           mock --configdir=$mocketc -r fc40xscl81          rebuild "
-alias mockfc40xscl82="           mock --configdir=$mocketc -r fc40xscl82          rebuild "
-alias mockfc40xscl83="           mock --configdir=$mocketc -r fc40xscl83          rebuild "
-alias mockfc40xscl84="           mock --configdir=$mocketc -r fc40xscl84          rebuild "
-alias mockfc40xr60="             mock --configdir=$mocketc -r fc40xr60            rebuild "
-alias mockfc40xr62="             mock --configdir=$mocketc -r fc40xr62            rebuild "
-alias mockfc40xr70="             mock --configdir=$mocketc -r fc40xr70            rebuild "
-alias mockfc40xr72="             mock --configdir=$mocketc -r fc40xr72            rebuild "
-alias mockfc40xr80="             mock --configdir=$mocketc -r fc40xr80            rebuild "
-alias mockfc40xm="               mock --configdir=$mocketc -r fc40xm              rebuild "
-
 alias mockfc41x="                mock --configdir=$mocketc -r fc41x               rebuild "
 alias mockfc41x74="              mock --configdir=$mocketc -r fc41x74             rebuild "
 alias mockfc41x80="              mock --configdir=$mocketc -r fc41x80             rebuild "
@@ -205,9 +166,6 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc41 Error !")&
     pids="$pids $!"
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (83) fc40  Ok." || echo "fc40 Error !")&
-    pids="$pids $!"
-    echo -n ""
     (mock $quiet --configdir=$mocketc -r el8n81    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
     pids="$pids $!"
     echo -n ""
@@ -238,10 +196,7 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc42x     rebuild "$@" && echo "$(date +%X) (84) fc42  Ok." || echo "fc42 Error !")&
     pids="$pids $!"
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc40 Error !")&
-    pids="$pids $!"
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (83) fc40  Ok." || echo "fc40 Error !")&
+    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc41 Error !")&
     pids="$pids $!"
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el8n82    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
@@ -274,10 +229,7 @@ if [ -f "$1" ]; then
     (mock $quiet --configdir=$mocketc -r fc42x     rebuild "$@" && echo "$(date +%X) (84) fc42  Ok." || echo "fc42 Error !")&
     pids="$pids $!"
     echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc40 Error !")&
-    pids="$pids $!"
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc40x     rebuild "$@" && echo "$(date +%X) (83) fc40  Ok." || echo "fc40 Error !")&
+    (mock $quiet --configdir=$mocketc -r fc41x     rebuild "$@" && echo "$(date +%X) (83) fc41  Ok." || echo "fc41 Error !")&
     pids="$pids $!"
     echo -n ""
     (mock $quiet --configdir=$mocketc -r el8n83    rebuild "$@" && echo "$(date +%X) (83) el8   Ok." || echo "el8  Error !")&
@@ -368,7 +320,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 40 42
+  for i in 41 42
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -420,7 +372,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 42 41 40
+  for i in 42 41
   do
     echo -n "$(date +%X) scl84 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -446,7 +398,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 42 40
+  for i in 41 42
   do
     echo -n "$(date +%X) scl83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -472,7 +424,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 40 42
+  for i in 41 42
   do
     echo -n "$(date +%X) scl82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -498,7 +450,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 42 41 40
+  for i in 42 41
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -604,7 +556,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 42 40
+  for i in 41 42
   do
     echo -n "$(date +%X) 84 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -630,7 +582,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 42 41 40
+  for i in 42 41
   do
     echo -n "$(date +%X) 83 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -677,7 +629,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 40 42
+  for i in 41 42
   do
     echo -n "$(date +%X) 82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -703,7 +655,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 42 40
+  for i in 41 42
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -729,7 +681,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 42 41 40
+  for i in 42 41
   do
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -755,7 +707,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 42 40
+  for i in 41 42
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -781,7 +733,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 41 40 42
+  for i in 41 42
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index f1f41e1..2d3f9b0 100755
--- a/getmock
+++ b/getmock
@@ -352,13 +352,6 @@ do
 				cp $i priv/fc42.x86_64 && echo + $i copied priv FC42
 			fi
 			;;
-		remi-crypto*fc40*)
-			if [ -f priv/fc40.x86_64/$j ]; then
-				echo " " $i already there
-			else
-				cp $i priv/fc40.x86_64 && echo + $i copied priv FC40
-			fi
-			;;
 		*-debuginfo-*aarch64.rpm|*-debugsource-*aarch64.rpm)
 			if [ -f ${debug}aarch64/$j ]; then
 				echo " " $i already there
@@ -521,8 +514,6 @@ elif [ $1 = all74 ]; then
 	[ $opt = test ] && opt=test74
 		getOneMock fc42x74 $opt '*7.4*'
 		getOneMock fc42a74 $opt '*7.4*'
-		getOneMock fc40x74 $opt '*7.4*'
-		getOneMock fc40a74 $opt '*7.4*'
 		getOneMock fc41x74 $opt '*7.4*'
 		getOneMock fc41a74 $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
@@ -537,8 +528,6 @@ elif [ $1 = all80 ]; then
 	[ $opt = test ] && opt=test80
 		getOneMock fc42x80 $opt '*8.0*'
 		getOneMock fc42a80 $opt '*8.0*'
-		getOneMock fc40x80 $opt '*8.0*'
-		getOneMock fc40a80 $opt '*8.0*'
 		getOneMock fc41x80 $opt '*8.0*'
 		getOneMock fc41a80 $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
@@ -553,8 +542,6 @@ elif [ $1 = all81 ]; then
 	[ $opt = test ] && opt=test81
 		getOneMock fc42x81 $opt '*8.1*'
 		getOneMock fc42a81 $opt '*8.1*'
-		getOneMock fc40x81 $opt '*8.1*'
-		getOneMock fc40a81 $opt '*8.1*'
 		getOneMock fc41x81 $opt '*8.1*'
 		getOneMock fc41a81 $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
@@ -569,8 +556,6 @@ elif [ $1 = all82 ]; then
 	[ $opt = test ] && opt=test82
 		getOneMock fc42x82 $opt '*8.2*'
 		getOneMock fc42a82 $opt '*8.2*'
-		getOneMock fc40x82 $opt '*8.2*'
-		getOneMock fc40a82 $opt '*8.2*'
 		getOneMock fc41x82 $opt '*8.2*'
 		getOneMock fc41a82 $opt '*8.2*'
 		getOneMock el8x82  $opt '*8.2*'
@@ -585,8 +570,6 @@ elif [ $1 = all83 ]; then
 	[ $opt = test ] && opt=test83
 		getOneMock fc42x83 $opt '*8.3*'
 		getOneMock fc42a83 $opt '*8.3*'
-		getOneMock fc40x83 $opt '*8.3*'
-		getOneMock fc40a83 $opt '*8.3*'
 		getOneMock fc41x83 $opt '*8.3*'
 		getOneMock fc41a83 $opt '*8.3*'
 		getOneMock el8x83  $opt '*8.3*'
@@ -601,8 +584,6 @@ elif [ $1 = all84 ]; then
 	[ $opt = test ] && opt=test84
 		getOneMock fc42x84 $opt '*8.4*'
 		getOneMock fc42a84 $opt '*8.4*'
-		getOneMock fc40x84 $opt '*8.4*'
-		getOneMock fc40a84 $opt '*8.4*'
 		getOneMock fc41x84 $opt '*8.4*'
 		getOneMock fc41a84 $opt '*8.4*'
 		getOneMock el8x84  $opt '*8.4*'
@@ -614,8 +595,6 @@ elif [ $1 = all84 ]; then
 
 elif [ $1 = allr60 ]; then
 	opt=redis60
-	getOneMock fc40x $opt '*6.0*'
-	getOneMock fc40a $opt '*6.0*'
 	getOneMock el8x  $opt '*6.0*'
 	getOneMock el8a  $opt '*6.0*'
 	getOneMock el9x  $opt '*6.0*'
@@ -623,8 +602,6 @@ elif [ $1 = allr60 ]; then
 
 elif [ $1 = allr62 ]; then
 	opt=redis62
-	getOneMock fc40x $opt '*6.2*'
-	getOneMock fc40a $opt '*6.2*'
 	getOneMock el8x  $opt '*6.2*'
 	getOneMock el8a  $opt '*6.2*'
 	getOneMock el9x  $opt '*6.2*'
@@ -632,8 +609,6 @@ elif [ $1 = allr62 ]; then
 
 elif [ $1 = allr70 ]; then
 	opt=redis70
-	getOneMock fc40x $opt '*7.0*'
-	getOneMock fc40a $opt '*7.0*'
 	getOneMock el8x  $opt '*7.0*'
 	getOneMock el8a  $opt '*7.0*'
 	getOneMock el9x  $opt '*7.0*'
@@ -641,8 +616,6 @@ elif [ $1 = allr70 ]; then
 
 elif [ $1 = allr72 ]; then
 	opt=redis72
-	getOneMock fc40x $opt '*7.2*'
-	getOneMock fc40a $opt '*7.2*'
 	getOneMock el8x  $opt '*7.2*'
 	getOneMock el8a  $opt '*7.2*'
 	getOneMock el9x  $opt '*7.2*'
@@ -665,8 +638,6 @@ elif [ $1 = allv81 ]; then
 
 elif [ $1 = allr80 ]; then
 	opt=redis80
-	getOneMock fc40x $opt '*8.0*'
-	getOneMock fc40a $opt '*8.0*'
 	getOneMock fc41x $opt '*8.0*'
 	getOneMock fc41a $opt '*8.0*'
 	getOneMock fc42x $opt '*8.0*'
@@ -687,8 +658,6 @@ elif [ $1 = allm ]; then
 	getOneMock fc42x $opt '*1.6*'
 	getOneMock fc42a $opt '*1.6*'
 	opt=memcached
-	getOneMock fc40x $opt '*1.6*'
-	getOneMock fc40a $opt '*1.6*'
 	getOneMock el9x  $opt '*1.6*'
 	getOneMock el9a  $opt '*1.6*'
 	getOneMock el10x $opt '*1.6*'
@@ -699,7 +668,7 @@ elif [ $1 = allx ]; then
 	do
 		(getOneMock el${i}x $opt)
 	done
-	for i in 40 41 42
+	for i in 41 42
 	do
 		(getOneMock fc${i}x $opt)
 	done
@@ -709,7 +678,7 @@ elif [ $1 = alla ]; then
 	do
 		(getOneMock el${i}a $opt)
 	done
-	for i in 40 41 42
+	for i in 41 42
 	do
 		(getOneMock fc${i}a $opt)
 	done
@@ -740,42 +709,42 @@ elif [ $1 = scl85 ]; then
 	done
 
 elif [ $1 = scl84 ]; then
-	for dis in fc40 fc41 fc42 el8 el9 el10
+	for dis in fc41 fc42 el8 el9 el10
 	do
 		getOneMock scl84${dis}x $opt
 		getOneMock scl84${dis}a $opt
 	done
 
 elif [ $1 = scl83 ]; then
-	for dis in fc40 fc41 fc42 el8 el9 el10
+	for dis in fc41 fc42 el8 el9 el10
 	do
 		getOneMock scl83${dis}x $opt
 		getOneMock scl83${dis}a $opt
 	done
 
 elif [ $1 = scl82 ]; then
-	for dis in fc40 fc41 fc42 el8 el9 el10
+	for dis in fc41 fc42 el8 el9 el10
 	do
 		getOneMock scl82${dis}x $opt
 		getOneMock scl82${dis}a $opt
 	done
 
 elif [ $1 = scl81 ]; then
-	for dis in fc40 fc41 fc42 el8 el9 el10
+	for dis in fc41 fc42 el8 el9 el10
 	do
 		getOneMock scl81${dis}x $opt
 		getOneMock scl81${dis}a $opt
 	done
 
 elif [ $1 = scl80 ]; then
-	for dis in fc42 fc40 fc41 el8 el9 el10
+	for dis in fc42 fc41 el8 el9 el10
 	do
 		getOneMock scl80${dis}x $opt
 		getOneMock scl80${dis}a $opt
 	done
 
 elif [ $1 = scl74 ]; then
-	for dis in fc42 fc40 fc41 el8 el9 el10
+	for dis in fc42 fc41 el8 el9 el10
 	do
 		getOneMock scl74${dis}x $opt
 		getOneMock scl74${dis}a $opt
diff --git a/mkallrepo b/mkallrepo
index 6710acf..6fbb62c 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -11,7 +11,7 @@ TMPSIG2025=$(mktemp -t XXXXXXXX.2025)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
+for dep in fedora/{41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -52,8 +52,7 @@ if [ -s $TMPSIG ]; then
 	# 2023
     grep fc39    $TMPSIG  > $TMPSIG2023
 	# 2024
-    grep fc40    $TMPSIG  > $TMPSIG2024
-    grep fc41    $TMPSIG >> $TMPSIG2024
+    grep fc41    $TMPSIG  > $TMPSIG2024
     grep el10    $TMPSIG >> $TMPSIG2024
 	# 2025
     grep src.rpm $TMPSIG  > $TMPSIG2025
@@ -119,7 +118,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{40,41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
+for dep in SRPMS fedora/{41,42}/*/{i386,x86_64,aarch64} enterprise/{8,9,10}/*/{x86_64,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 61de312..19f8753 100755
--- a/mkmodular
+++ b/mkmodular
@@ -435,6 +435,7 @@ chdir($old);
 }
 
 /*
+// -------------- Fedora 39 -----------------------------------
 if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv'])) {
 	$dest = 'fedora/39/modular/x86_64';
 	echo "Populate $dest\n";
@@ -578,7 +579,8 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/39/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-*/
+
+// -------------- Fedora 40 -----------------------------------
 if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv'])) {
 	$dest = 'fedora/40/modular/x86_64';
 	echo "Populate $dest\n";
@@ -730,7 +732,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/40/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-
+*/
 // -------------- Fedora 41 -----------------------------------
 if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv'])) {
 	$dest = 'fedora/41/modular/x86_64';
diff --git a/mockit b/mockit
index 8125d92..43244bf 100755
--- a/mockit
+++ b/mockit
@@ -145,10 +145,6 @@ fi
 # PHP version matrix
 echo mockit $SRPM $DIST $MIN $MAX $@
 case $DIST in
-	fc40x|fc40a)
-		LST="74 80 81 82 83 84"
-		SCL="74 80 81 82 83 84"
-		;;
 	fc42x|fc42a|fc41x|fc41a|el9x|el9a|el10x|el10a)
 		LST="74 80 81 82 83 84"
 		SCL="74 80 81 82 83 84 85"
@@ -163,7 +159,7 @@ case $DIST in
 		;;
 	all)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40x fc41x fc42x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a
+			for i in fc41x fc42x el8x el9x el10x fc41a fc42a el8a el9a el10a
 			do
 				[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
 				[ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl  $SRPM $i $MIN $MAX $@
@@ -175,7 +171,7 @@ case $DIST in
 	zts)
 		if [ $REDIS -ge 1 ]; then
 			[ $MAX -gt 83 ] && MAX=83
-			for i in fc40x el8x el9x
+			for i in el8x el9x
 			do
 				[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
 			done
@@ -185,7 +181,7 @@ case $DIST in
 		;;
 	memcached)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40xm fc41x fc42x el8x el9xm el10xm fc40am fc41a fc42a el8a el9am el10am
+			for i in fc41x fc42x el8x el9xm el10xm fc41a fc42a el8a el9am el10am
 			do
 				$0 --valkey --mock $SRPM $i $MIN $MAX $@
 			done
@@ -195,7 +191,7 @@ case $DIST in
 		;;
 	im6)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40x el8xr el9x fc40a el8ar el9a
+			for i in el8xr el9x el8ar el9a
 			do
 				$0 --valkey --mock $SRPM $i $MIN $MAX $@
 			done
@@ -205,7 +201,7 @@ case $DIST in
 		;;
 	im7)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40x fc41x fc42x el8xr el9x el10x fc40a fc41a fc42a el8ar el9a el10a
+			for i in fc41x fc42x el8xr el9x el10x fc41a fc42a el8ar el9a el10a
 			do
 				$0 --valkey --mock $SRPM $i $MIN $MAX $@
 			done
@@ -225,7 +221,7 @@ case $DIST in
 		;;
 	r80)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc42x fc41x fc40x el8x el9x el10x fc40a fc41a fc42a el8a el9a el10a
+			for i in fc42x fc41x el8x el9x el10x fc41a fc42a el8a el9a el10a
 			do
 				$0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
 			done
@@ -235,7 +231,7 @@ case $DIST in
 		;;
 	r72)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40x el8x el9x el10x fc40a el8a el9a el10a
+			for i in el8x el9x el10x el8a el9a el10a
 			do
 				$0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
 			done
@@ -245,7 +241,7 @@ case $DIST in
 		;;
 	r60|r62|r70)
 		if [ $REDIS -ge 1 ]; then
-			for i in fc40x el8x el9x fc40a el8a el9a
+			for i in el8x el9x el8a el9a
 			do
 				$0 --valkey --mock $SRPM ${i}${DIST} $MIN $MAX $@
 			done