F33 (wip)

3 files changed, 25 insertions, 10 deletions

diff --git a/buildfct b/buildfct
index 01d7b4d..eeef6fa 100644
--- a/buildfct
+++ b/buildfct
@@ -41,6 +41,17 @@ alias mockfc32xscl73="           mock --configdir=$mocketc -r fc32xscl73
 alias mockfc32xscl74="           mock --configdir=$mocketc -r fc32xscl74          rebuild "
 alias mockfc32xscl80="           mock --configdir=$mocketc -r fc32xscl80          rebuild "
 
+alias mockfc33x="                mock --configdir=$mocketc -r fc33x               rebuild "
+alias mockfc33xd="               mock --configdir=$mocketc -r fc33xd              rebuild "
+alias mockfc33xr="               mock --configdir=$mocketc -r fc33xr              rebuild "
+alias mockfc33xscl56="           mock --configdir=$mocketc -r fc33xscl56          rebuild "
+alias mockfc33xscl70="           mock --configdir=$mocketc -r fc33xscl70          rebuild "
+alias mockfc33xscl71="           mock --configdir=$mocketc -r fc33xscl71          rebuild "
+alias mockfc33xscl72="           mock --configdir=$mocketc -r fc33xscl72          rebuild "
+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 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 "
@@ -360,7 +371,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 30
+  for i in 31 32 30 33
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -386,7 +397,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 30 32
+  for i in 31 30 32 33
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !"
@@ -848,7 +859,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32
+  for i in 31 32 33
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index a69d345..4a0743f 100755
--- a/getmock
+++ b/getmock
@@ -273,6 +273,10 @@ if [ $1 = glpi94 ]; then
 	opt=glpi94
 	shift
 fi
+if [ $1 = redis50 -o $1 = redis60 ]; then
+	opt=$1
+	shift
+fi
 if [ $1 = devs -o $1 = dev ]; then
 	opt=devs
 	shift
@@ -375,7 +379,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 30 31 32
+	for i in 30 31 32 33
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -427,7 +431,7 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl80 ]; then
-	for i in 31 32
+	for i in 31 32 33
 	do
 		getOneMock scl80fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index c442df0..8e0f9b9 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -10,7 +10,7 @@ TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{30,31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -36,13 +36,13 @@ find SRPMS -name \*.rpm -a -newer SRPMS/repodata -print >>$TMPSIG
 if [ -s $TMPSIG ]; then
     echo "À signer:"; sort < $TMPSIG
 
-    grep fc29    $TMPSIG  > $TMPSIG3
-    grep el8     $TMPSIG >> $TMPSIG3
+    grep el8     $TMPSIG  > $TMPSIG3
 
     grep fc30    $TMPSIG  > $TMPSIG4
     grep fc31    $TMPSIG >> $TMPSIG4
 
     grep fc32    $TMPSIG  > $TMPSIG2020
+    grep fc33    $TMPSIG >> $TMPSIG2020
     grep src.rpm $TMPSIG >> $TMPSIG2020
 
     if [ -s $TMPSIG2020 ]; then
@@ -66,7 +66,7 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc29 $TMPSIG | grep -v fc30 | grep -v fc31 | grep -v fc32 | grep -v src.rpm | grep -v el8 > $TMPSIG1
+	grep -v fc3 $TMPSIG | grep -v src.rpm | grep -v el8 > $TMPSIG1
     if [ -s $TMPSIG1 ]; then
 		echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG1)
@@ -92,7 +92,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{30,31,32,33}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue