From 7c745ac67090cd71cb76db976c9cf9946d5724e1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 22 Sep 2016 08:08:23 +0200
Subject: F21 repo is closed

---
 buildfct  | 45 ++++++++++-----------------------------------
 getmock   | 18 +++++++++---------
 mkallrepo |  4 ++--
 3 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/buildfct b/buildfct
index b91f03b..12d0a33 100644
--- a/buildfct
+++ b/buildfct
@@ -5,29 +5,6 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
 
 mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 
-alias mockfc20i="  setarch i686  mock --configdir=$mocketc -r fc20i   --arch i686 rebuild "
-alias mockfc20i56="setarch i686  mock --configdir=$mocketc -r fc20i56 --arch i686 rebuild "
-alias mockfc20x="                mock --configdir=$mocketc -r fc20x               rebuild "
-alias mockfc20xt="               mock --configdir=$mocketc -r fc20xt              rebuild "
-alias mockfc20t56="              mock --configdir=$mocketc -r fc20t56             rebuild "
-alias mockfc20x56="              mock --configdir=$mocketc -r fc20x56             rebuild "
-alias mockfc20xscl54="           mock --configdir=$mocketc -r fc20xscl54          rebuild "
-alias mockfc20xscl56="           mock --configdir=$mocketc -r fc20xscl56          rebuild "
-alias mockfc20xscl70="           mock --configdir=$mocketc -r fc20xscl70          rebuild "
-
-alias mockfc21i="  setarch i686  mock --configdir=$mocketc -r fc21i   --arch i686 rebuild "
-alias mockfc21i56="setarch i686  mock --configdir=$mocketc -r fc21i56 --arch i686 rebuild "
-alias mockfc21i70="setarch i686  mock --configdir=$mocketc -r fc21i70 --arch i686 rebuild "
-alias mockfc21x="                mock --configdir=$mocketc -r fc21x               rebuild "
-alias mockfc21x56="              mock --configdir=$mocketc -r fc21x56             rebuild "
-alias mockfc21x70="              mock --configdir=$mocketc -r fc21x70             rebuild "
-alias mockfc21xt="               mock --configdir=$mocketc -r fc21xt              rebuild "
-alias mockfc21xd="               mock --configdir=$mocketc -r fc21xd              rebuild "
-alias mockfc21xscl54="           mock --configdir=$mocketc -r fc21xscl54          rebuild "
-alias mockfc21xscl55="           mock --configdir=$mocketc -r fc21xscl55          rebuild "
-alias mockfc21xscl56="           mock --configdir=$mocketc -r fc21xscl56          rebuild "
-alias mockfc21xscl70="           mock --configdir=$mocketc -r fc21xscl70          rebuild "
-
 alias mockfc22i="  setarch i686  mock --configdir=$mocketc -r fc22i   --arch i686 rebuild "
 alias mockfc22i70="setarch i686  mock --configdir=$mocketc -r fc22i70 --arch i686 rebuild "
 alias mockfc22x="                mock --configdir=$mocketc -r fc22x               rebuild "
@@ -133,7 +110,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25 22 21
+  for i in 23 24 25 22
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -224,8 +201,6 @@ if [ -f "$1" ]; then
   setarch i686    mock $quiet --configdir=$mocketc -r fc23i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 70 fc22 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc22i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) 70 fc21 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc21i70 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 70 el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r el6i70  --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -268,7 +243,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 21 22
+  for i in 23 22 24 25
   do
     echo -n "$(date +%X) test-fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}it  --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -293,7 +268,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 25 22 21
+  for i in 23 24 25 22
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -342,7 +317,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 25 24 23 22 21
+  for i in 25 24 23 22
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}xt  rebuild $1 && echo "$(date +%X) (56) fc$i  Ok." || echo "fc$1 Error !")&
@@ -413,7 +388,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 22 21
+  for i in 23 24 22
   do
     echo -n "$(date +%X) 70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -491,7 +466,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 22 21 25
+  for i in 23 24 22 25
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -517,7 +492,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 25 24 22 21
+  for i in 23 25 24 22
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -543,7 +518,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 25 24 22 21
+  for i in 23 25 24 22
   do
     echo -n "$(date +%X) scl55 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
@@ -569,7 +544,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 24 22 21 25
+  for i in 23 24 22 25
   do
     echo -n "$(date +%X) scl54 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
@@ -595,7 +570,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 23 21 22
+  for i in 23 22 24 25
   do
     echo -n "$(date +%X) test-fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xt rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index bafcf98..c8e6dee 100755
--- a/getmock
+++ b/getmock
@@ -184,7 +184,7 @@ if [ $1 = devs -o $1 = dev ]; then
 fi
 
 if [ $1 = all ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock fc${i}i $opt
 	done
@@ -213,7 +213,7 @@ elif [ $1 = all56 ]; then
 elif [ $1 = all70 ]; then
 	[ $opt = remi ] && opt=php70
 	[ $opt = test ] && opt=test70
-	for n in 21 22 23 24
+	for n in 22 23 24
 	do
 		getOneMock fc${n}i $opt
 		getOneMock fc${n}x $opt
@@ -248,7 +248,7 @@ elif [ $1 = all54 ]; then
 		getOneMock el${n}x remi
 
 elif [ $1 = for56 ]; then
-	for i in 21 22 23 24
+	for i in 22 23 24
 	do
 		getOneMock fc${i}x remi
 	done
@@ -258,7 +258,7 @@ elif [ $1 = for56 ]; then
 	done
 
 elif [ $1 = for55 ]; then
-	for i in 21 22 23 24
+	for i in 22 23 24
 	do
 		getOneMock fc${i}x remi
 	done
@@ -268,7 +268,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -278,7 +278,7 @@ elif [ $1 = allx ]; then
 	done
 
 elif [ $1 = scl54 ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock scl54fc${i}x $opt
 	done
@@ -288,7 +288,7 @@ elif [ $1 = scl54 ]; then
 	done
 
 elif [ $1 = scl55 ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock scl55fc${i}x $opt
 	done
@@ -298,7 +298,7 @@ elif [ $1 = scl55 ]; then
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock scl56fc${i}x $opt
 	done
@@ -308,7 +308,7 @@ elif [ $1 = scl56 ]; then
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 21 22 23 24 25
+	for i in 22 23 24 25
 	do
 		getOneMock scl70fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index cf672dd..90b5c21 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -6,7 +6,7 @@ TMPLNK=$(mktemp)
 cd /home/rpmbuild/site/rpms
 
 #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in fedora/{21,22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
+for dep in fedora/{22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
 do
 	arch=${dep##*/}
 
@@ -51,7 +51,7 @@ else 	echo "Rien à lier."
 fi
 
 #for dep in *.{i386,ppc,ppc64,x86_64} fedora/*/*/{i386,ppc,ppc64,x86_64}
-for dep in SRPMS fedora/{21,22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
+for dep in SRPMS fedora/{22,23,24,25}/*/{i386,x86_64} enterprise/{5,6,7}/*/{i386,x86_64}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="
-- 
cgit