add F35 helpers, remove F32

4 files changed, 63 insertions, 54 deletions

diff --git a/buildfct b/buildfct
index 1489997..86917db 100644
--- a/buildfct
+++ b/buildfct
@@ -5,32 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
 
 mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 
-alias mockfc30i="  setarch i686  mock --configdir=$mocketc -r fc30i   --arch i686 rebuild "
-alias mockfc30ir=" setarch i686  mock --configdir=$mocketc -r fc30ir  --arch i686 rebuild "
-alias mockfc30i74="setarch i686  mock --configdir=$mocketc -r fc30i74 --arch i686 rebuild "
-alias mockfc30x="                mock --configdir=$mocketc -r fc30x               rebuild "
-alias mockfc30xr="               mock --configdir=$mocketc -r fc30xr              rebuild "
-alias mockfc30x74="              mock --configdir=$mocketc -r fc30x74             rebuild "
-alias mockfc30xscl56="           mock --configdir=$mocketc -r fc30xscl56          rebuild "
-alias mockfc30xscl70="           mock --configdir=$mocketc -r fc30xscl70          rebuild "
-alias mockfc30xscl71="           mock --configdir=$mocketc -r fc30xscl71          rebuild "
-alias mockfc30xscl72="           mock --configdir=$mocketc -r fc30xscl72          rebuild "
-alias mockfc30xscl73="           mock --configdir=$mocketc -r fc30xscl73          rebuild "
-alias mockfc30xscl74="           mock --configdir=$mocketc -r fc30xscl74          rebuild "
-
-alias mockfc31x="                mock --configdir=$mocketc -r fc31x               rebuild "
-alias mockfc31xd="               mock --configdir=$mocketc -r fc31xd              rebuild "
-alias mockfc31xr="               mock --configdir=$mocketc -r fc31xr              rebuild "
-alias mockfc31x74="              mock --configdir=$mocketc -r fc31x74             rebuild "
-alias mockfc31x80="              mock --configdir=$mocketc -r fc31x80             rebuild "
-alias mockfc31xscl56="           mock --configdir=$mocketc -r fc31xscl56          rebuild "
-alias mockfc31xscl70="           mock --configdir=$mocketc -r fc31xscl70          rebuild "
-alias mockfc31xscl71="           mock --configdir=$mocketc -r fc31xscl71          rebuild "
-alias mockfc31xscl72="           mock --configdir=$mocketc -r fc31xscl72          rebuild "
-alias mockfc31xscl73="           mock --configdir=$mocketc -r fc31xscl73          rebuild "
-alias mockfc31xscl74="           mock --configdir=$mocketc -r fc31xscl74          rebuild "
-alias mockfc31xscl80="           mock --configdir=$mocketc -r fc31xscl80          rebuild "
-
 alias mockfc32i="  setarch i686  mock --configdir=$mocketc -r fc32i   --arch i686 rebuild "
 alias mockfc32x="                mock --configdir=$mocketc -r fc32x               rebuild "
 alias mockfc32xd="               mock --configdir=$mocketc -r fc32xd              rebuild "
@@ -74,6 +48,20 @@ alias mockfc34xscl74="           mock --configdir=$mocketc -r fc34xscl74
 alias mockfc34xscl80="           mock --configdir=$mocketc -r fc34xscl80          rebuild "
 alias mockfc34xscl81="           mock --configdir=$mocketc -r fc34xscl81          rebuild "
 
+alias mockfc35i="  setarch i686  mock --configdir=$mocketc -r fc35i   --arch i686 rebuild "
+alias mockfc35x="                mock --configdir=$mocketc -r fc35x               rebuild "
+alias mockfc35xd="               mock --configdir=$mocketc -r fc35xd              rebuild "
+alias mockfc35xr="               mock --configdir=$mocketc -r fc35xr              rebuild "
+alias mockfc35x81="              mock --configdir=$mocketc -r fc35x81             rebuild "
+alias mockfc35xscl56="           mock --configdir=$mocketc -r fc35xscl56          rebuild "
+alias mockfc35xscl70="           mock --configdir=$mocketc -r fc35xscl70          rebuild "
+alias mockfc35xscl71="           mock --configdir=$mocketc -r fc35xscl71          rebuild "
+alias mockfc35xscl72="           mock --configdir=$mocketc -r fc35xscl72          rebuild "
+alias mockfc35xscl73="           mock --configdir=$mocketc -r fc35xscl73          rebuild "
+alias mockfc35xscl74="           mock --configdir=$mocketc -r fc35xscl74          rebuild "
+alias mockfc35xscl80="           mock --configdir=$mocketc -r fc35xscl80          rebuild "
+alias mockfc35xscl81="           mock --configdir=$mocketc -r fc35xscl81          rebuild "
+
 alias mockel6i="  setarch i686 mock --configdir=$mocketc -r el6i   --arch i686 rebuild "
 alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it  --arch i686 rebuild "
 alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild "
@@ -157,7 +145,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34 32
+  for i in 33 34 35
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -183,7 +171,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34 33 32
+  for i in 34 33 35
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild "$@" && echo " Ok." || echo " Error !"
@@ -209,7 +197,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 32 34
+  for i in 33 35 34
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -273,7 +261,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 32 33 34
+  for i in 33 34 35
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -306,7 +294,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 32 33 34
+  for i in 33 34 35
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -506,7 +494,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34
+  for i in 33 34 35
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -532,7 +520,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34
+  for i in 33 35 34
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -558,7 +546,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 32 33 34
+  for i in 33 34
   do
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -584,7 +572,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34 32
+  for i in 33 34 35
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -610,7 +598,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 32 34
+  for i in 33 34 35
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -636,7 +624,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34 32
+  for i in 33 35 34
   do
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -662,7 +650,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 32 34
+  for i in 33 34 35
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -688,7 +676,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 32 34
+  for i in 33 35 34
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -714,7 +702,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 34 32
+  for i in 33 34 35
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -740,7 +728,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 33 32 34
+  for i in 33 35 34
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index fb596c8..5292e0a 100755
--- a/getmock
+++ b/getmock
@@ -321,7 +321,6 @@ elif [ $1 = all74 ]; then
 elif [ $1 = all80 ]; then
 	[ $opt = remi ] && opt=php80
 	[ $opt = test ] && opt=test80
-		getOneMock fc32x   $opt '*8.0*'
 		getOneMock fc33x   $opt '*8.0*'
 		getOneMock fc34x   $opt '*8.0*'
 		getOneMock el7x    $opt '*8.0*'
@@ -332,6 +331,7 @@ elif [ $1 = all81 ]; then
 	[ $opt = test ] && opt=test81
 		getOneMock fc33x   $opt '*8.1*'
 		getOneMock fc34x   $opt '*8.1*'
+		getOneMock fc35x   $opt '*8.1*'
 		getOneMock el7x    $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
 
@@ -352,7 +352,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -374,7 +374,7 @@ elif [ $1 = scl55 ]; then
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl56fc${i}x $opt
 	done
@@ -384,7 +384,7 @@ elif [ $1 = scl56 ]; then
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl70fc${i}x $opt
 	done
@@ -394,7 +394,7 @@ elif [ $1 = scl70 ]; then
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl71fc${i}x $opt
 	done
@@ -404,7 +404,7 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl81 ]; then
-	for i in 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl81fc${i}x $opt
 	done
@@ -414,7 +414,7 @@ elif [ $1 = scl81 ]; then
 	done
 
 elif [ $1 = scl80 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl80fc${i}x $opt
 	done
@@ -424,7 +424,7 @@ elif [ $1 = scl80 ]; then
 	done
 
 elif [ $1 = scl74 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl74fc${i}x $opt
 	done
@@ -434,7 +434,7 @@ elif [ $1 = scl74 ]; then
 	done
 
 elif [ $1 = scl73 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl73fc${i}x $opt
 	done
@@ -444,7 +444,7 @@ elif [ $1 = scl73 ]; then
 	done
 
 elif [ $1 = scl72 ]; then
-	for i in 32 33 34
+	for i in 33 34 35
 	do
 		getOneMock scl72fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 0949530..bcd6bb5 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{31,32,33,34}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{33,34,35}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -48,6 +48,7 @@ if [ -s $TMPSIG ]; then
     grep fc33    $TMPSIG >> $TMPSIG2020
 	# 2021
     grep fc34    $TMPSIG  > $TMPSIG2021
+    grep fc35    $TMPSIG >> $TMPSIG2021
     grep src.rpm $TMPSIG >> $TMPSIG2021
 
     if [ -s $TMPSIG2021 ]; then
@@ -103,7 +104,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{31,32,33,34}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{33,34,35}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
diff --git a/mkmodular b/mkmodular
index 3cf25cc..495cfea 100755
--- a/mkmodular
+++ b/mkmodular
@@ -389,7 +389,6 @@ if (in_array('f31', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/31/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-*/
 if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
 	$dest = 'fedora/32/modular/x86_64';
 	echo "Populate $dest\n";
@@ -409,6 +408,7 @@ if (in_array('f32', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/32/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
+*/
 
 if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	$dest = 'fedora/33/modular/x86_64';
@@ -454,6 +454,26 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	createRepo($dest, $mod);
 }
 
+if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
+	$dest = 'fedora/35/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'f35'];
+	$mod  = genModule('fedora/35/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']);
+	createRepo($dest, $mod);
+}
+if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'fedora/35/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'f35'];
+	$mod  = genModule('fedora/35/test/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+
 if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
 	echo "Populate $dest\n";