From 2c9f17697bd9da34e608f8e1e843d11590c6217c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Jun 2021 16:47:09 +0200
Subject: helpers for php81 scl

---
 buildfct    | 32 +++++++++++++++++++++++++++++++-
 cleanoldrpm | 18 ++++++++++--------
 getmock     | 18 +++++++++++++++++-
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/buildfct b/buildfct
index 5ffd02f..da01728 100644
--- a/buildfct
+++ b/buildfct
@@ -56,6 +56,7 @@ alias mockfc33xscl72="           mock --configdir=$mocketc -r fc33xscl72
 alias mockfc33xscl73="           mock --configdir=$mocketc -r fc33xscl73          rebuild "
 alias mockfc33xscl74="           mock --configdir=$mocketc -r fc33xscl74          rebuild "
 alias mockfc33xscl80="           mock --configdir=$mocketc -r fc33xscl80          rebuild "
+alias mockfc33xscl81="           mock --configdir=$mocketc -r fc33xscl81          rebuild "
 
 alias mockfc34i="  setarch i686  mock --configdir=$mocketc -r fc34i   --arch i686 rebuild "
 alias mockfc34x="                mock --configdir=$mocketc -r fc34x               rebuild "
@@ -69,6 +70,7 @@ alias mockfc34xscl72="           mock --configdir=$mocketc -r fc34xscl72
 alias mockfc34xscl73="           mock --configdir=$mocketc -r fc34xscl73          rebuild "
 alias mockfc34xscl74="           mock --configdir=$mocketc -r fc34xscl74          rebuild "
 alias mockfc34xscl80="           mock --configdir=$mocketc -r fc34xscl80          rebuild "
+alias mockfc34xscl81="           mock --configdir=$mocketc -r fc34xscl81          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 "
@@ -116,6 +118,7 @@ alias mockel7xscl72="          mock --configdir=$mocketc -r el7xscl72          r
 alias mockel7xscl73="          mock --configdir=$mocketc -r el7xscl73          rebuild "
 alias mockel7xscl74="          mock --configdir=$mocketc -r el7xscl74          rebuild "
 alias mockel7xscl80="          mock --configdir=$mocketc -r el7xscl80          rebuild "
+alias mockel7xscl81="          mock --configdir=$mocketc -r el7xscl81          rebuild "
 
 alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
 alias mockel8xr="              mock --configdir=$mocketc -r el8xr              rebuild "
@@ -131,6 +134,7 @@ alias mockel8xscl72="          mock --configdir=$mocketc -r el8xscl72          r
 alias mockel8xscl73="          mock --configdir=$mocketc -r el8xscl73          rebuild "
 alias mockel8xscl74="          mock --configdir=$mocketc -r el8xscl74          rebuild "
 alias mockel8xscl80="          mock --configdir=$mocketc -r el8xscl80          rebuild "
+alias mockel8xscl81="          mock --configdir=$mocketc -r el8xscl81          rebuild "
 
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
@@ -488,6 +492,32 @@ else
 fi
 }
 
+# Build All distribution / version / 64bits for remi/scl-php81
+mockscl81x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  for i in 33 34
+  do
+    echo -n "$(date +%X) scl81 fc$i "
+    mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  for i in 7 8
+  do
+    echo -n "$(date +%X) scl81 el$i  "
+    mock $quiet --configdir=$mocketc -r el${i}xscl81 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/remi-php74
 mock80x()
 {
@@ -540,7 +570,7 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/scl-php80
+# Build All distribution / version / 64bits for remi/scl-php74
 mockscl74x()
 {
 quiet=""
diff --git a/cleanoldrpm b/cleanoldrpm
index c72c4d0..95db69e 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -7,14 +7,16 @@ $mode = 0;
 $keep = 0;
 $dest = false;
 $multi = [
-	'php'			=> 3, 	// php/8.0
-	'redis'			=> 3,	// redis/6.2
-	'redis-devel' 	=> 3,	// redis/6.2
-	'redis-doc' 	=> 3,	// redis/6.2
-	'redis-trib' 	=> 3,	// redis/6.2
-	'redis'			=> 3,	// redis/6.2
-	'composer' 		=> 1,	// composer/2
-	'phan' 			=> 1,	// phan/3
+	'php'				=> 3, 	// php/8.0
+	'redis'				=> 3,	// redis/6.2
+	'redis-debuginfo' 	=> 3,	// redis/6.2
+	'redis-debugsource' => 3,	// redis/6.2
+	'redis-devel' 		=> 3,	// redis/6.2
+	'redis-doc' 		=> 3,	// redis/6.2
+	'redis-trib' 		=> 3,	// redis/6.2
+	'redis'				=> 3,	// redis/6.2
+	'composer' 			=> 1,	// composer/2
+	'phan' 				=> 1,	// phan/3
 ];
 if (isset($_SERVER['argv'][1])) {
 	$keep = (int)$_SERVER['argv'][1];
diff --git a/getmock b/getmock
index 189bfac..9ab7468 100755
--- a/getmock
+++ b/getmock
@@ -15,6 +15,9 @@ esac
 rep=${2-remi}
 
 case $dep in 
+scl81el*)	dep=${dep#scl81el}
+	type=enterprise
+	;;
 scl80el*)	dep=${dep#scl80el}
 	type=enterprise
 	;;
@@ -88,12 +91,15 @@ el*)	dep=${dep#el}
 fc*)	dep=${dep#fc}
 	type=fedora
 	;;
-scl74fc*)	dep=${dep#scl74fc}
+scl81fc*)	dep=${dep#scl81fc}
 	type=fedora
 	;;
 scl80fc*)	dep=${dep#scl80fc}
 	type=fedora
 	;;
+scl74fc*)	dep=${dep#scl74fc}
+	type=fedora
+	;;
 scl73fc*)	dep=${dep#scl73fc}
 	type=fedora
 	;;
@@ -379,6 +385,16 @@ elif [ $1 = scl71 ]; then
 		getOneMock scl71el${i}x $opt
 	done
 
+elif [ $1 = scl81 ]; then
+	for i in 33 34
+	do
+		getOneMock scl81fc${i}x $opt
+	done
+	for i in 7 8
+	do
+		getOneMock scl81el${i}x $opt
+	done
+
 elif [ $1 = scl80 ]; then
 	for i in 32 33 34
 	do
-- 
cgit