+f29 -f25

3 files changed, 49 insertions, 84 deletions

diff --git a/buildfct b/buildfct
index a247b65..48e43bf 100644
--- a/buildfct
+++ b/buildfct
@@ -18,18 +18,18 @@ mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 #alias mockfc24xscl71="           mock --configdir=$mocketc -r fc24xscl71          rebuild "
 #alias mockfc24xscl72="           mock --configdir=$mocketc -r fc24xscl72          rebuild "
 
-alias mockfc25i="  setarch i686  mock --configdir=$mocketc -r fc25i   --arch i686 rebuild "
-alias mockfc25i71="setarch i686  mock --configdir=$mocketc -r fc25i71 --arch i686 rebuild "
-alias mockfc25i72="setarch i686  mock --configdir=$mocketc -r fc25i72 --arch i686 rebuild "
-alias mockfc25x="                mock --configdir=$mocketc -r fc25x               rebuild "
-alias mockfc25x71="              mock --configdir=$mocketc -r fc25x71             rebuild "
-alias mockfc25x72="              mock --configdir=$mocketc -r fc25x72             rebuild "
-alias mockfc25xscl54="           mock --configdir=$mocketc -r fc25xscl54          rebuild "
-alias mockfc25xscl55="           mock --configdir=$mocketc -r fc25xscl55          rebuild "
-alias mockfc25xscl56="           mock --configdir=$mocketc -r fc25xscl56          rebuild "
-alias mockfc25xscl70="           mock --configdir=$mocketc -r fc25xscl70          rebuild "
-alias mockfc25xscl71="           mock --configdir=$mocketc -r fc25xscl71          rebuild "
-alias mockfc25xscl72="           mock --configdir=$mocketc -r fc25xscl72          rebuild "
+#alias mockfc25i="  setarch i686  mock --configdir=$mocketc -r fc25i   --arch i686 rebuild "
+#alias mockfc25i71="setarch i686  mock --configdir=$mocketc -r fc25i71 --arch i686 rebuild "
+#alias mockfc25i72="setarch i686  mock --configdir=$mocketc -r fc25i72 --arch i686 rebuild "
+#alias mockfc25x="                mock --configdir=$mocketc -r fc25x               rebuild "
+#alias mockfc25x71="              mock --configdir=$mocketc -r fc25x71             rebuild "
+#alias mockfc25x72="              mock --configdir=$mocketc -r fc25x72             rebuild "
+#alias mockfc25xscl54="           mock --configdir=$mocketc -r fc25xscl54          rebuild "
+#alias mockfc25xscl55="           mock --configdir=$mocketc -r fc25xscl55          rebuild "
+#alias mockfc25xscl56="           mock --configdir=$mocketc -r fc25xscl56          rebuild "
+#alias mockfc25xscl70="           mock --configdir=$mocketc -r fc25xscl70          rebuild "
+#alias mockfc25xscl71="           mock --configdir=$mocketc -r fc25xscl71          rebuild "
+#alias mockfc25xscl72="           mock --configdir=$mocketc -r fc25xscl72          rebuild "
 
 alias mockfc26i="  setarch i686  mock --configdir=$mocketc -r fc26i   --arch i686 rebuild "
 alias mockfc26i72="setarch i686  mock --configdir=$mocketc -r fc26i72 --arch i686 rebuild "
@@ -64,6 +64,16 @@ alias mockfc28xscl71="           mock --configdir=$mocketc -r fc28xscl71
 alias mockfc28xscl72="           mock --configdir=$mocketc -r fc28xscl72          rebuild "
 alias mockfc28xscl73="           mock --configdir=$mocketc -r fc28xscl73          rebuild "
 
+alias mockfc29i="  setarch i686  mock --configdir=$mocketc -r fc29i   --arch i686 rebuild "
+alias mockfc29i73="setarch i686  mock --configdir=$mocketc -r fc29i73 --arch i686 rebuild "
+alias mockfc29x="                mock --configdir=$mocketc -r fc29x               rebuild "
+alias mockfc29x73="              mock --configdir=$mocketc -r fc29x73             rebuild "
+alias mockfc29xscl56="           mock --configdir=$mocketc -r fc29xscl56          rebuild "
+alias mockfc29xscl70="           mock --configdir=$mocketc -r fc29xscl70          rebuild "
+alias mockfc29xscl71="           mock --configdir=$mocketc -r fc29xscl71          rebuild "
+alias mockfc29xscl72="           mock --configdir=$mocketc -r fc29xscl72          rebuild "
+alias mockfc29xscl73="           mock --configdir=$mocketc -r fc29xscl73          rebuild "
+
 #alias mockel4i="setarch i686  mock --configdir=$mocketc -r el4i  --arch i386 rebuild "
 #alias mockel4it="setarch i686 mock --configdir=$mocketc -r el4it --arch i386 rebuild "
 #alias mockel4x="              mock --configdir=$mocketc -r el4x              rebuild "
@@ -134,7 +144,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 28 27 26 25
+  for i in 29 28 27 26
   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 !"
@@ -157,7 +167,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 28 27 26 25
+  for i in 29 28 27 26
   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 !"
@@ -267,8 +277,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  echo -n "$(date +%X) 71 fc25 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc25i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 71 el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r  el6i71 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -291,8 +299,6 @@ if [ -f "$1" ]; then
   setarch i686    mock $quiet --configdir=$mocketc -r fc27i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 72 fc26 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc26i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) 72 fc25 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc25i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 72 el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r  el6i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -311,6 +317,8 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
+  echo -n "$(date +%X) 73 fc29 "
+  setarch i686    mock $quiet --configdir=$mocketc -r fc29i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 73 fc28 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc28i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 73 fc27 "
@@ -333,11 +341,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 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 !"
-  done
   echo -n "$(date +%X) test-el6  "
   setarch   i686  mock $quiet --configdir=$mocketc -r el6it     --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -356,7 +359,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 29 27 28 26
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -382,7 +385,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 27 28 26 29
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -446,7 +449,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 28 27 26 25
+  for i in 29 28 27 26
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x  rebuild $1 && echo "$(date +%X) (56) fc$i  Ok." || echo "fc$1 Error !")&
@@ -476,7 +479,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 28 27 26 25
+  for i in 29 28 27 26
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (70) fc$i  Ok." || echo "fc$1 Error !")&
@@ -506,18 +509,12 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 28 27 26
+  for i in 28 27 26 29
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (71) fc$i  Ok." || echo "fc$1 Error !")&
     pids="$pids $!"
   done
-  for i in 25
-  do
-    echo -n ""
-    (mock $quiet --configdir=$mocketc -r fc${i}x71  rebuild $1 && echo "$(date +%X) (71) fc$i  Ok." || echo "fc$1 Error !")&
-    pids="$pids $!"
-  done
   for i in 7 6
   do
     echo -n ""
@@ -604,11 +601,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 25
-  do
-    echo -n "$(date +%X) 71 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x71 rebuild $1 && echo " Ok." || echo " Error !"
-  done
   for i in 7 6
   do
     echo -n "$(date +%X) 71 el$i  "
@@ -630,7 +622,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 26 25
+  for i in 27 26
   do
     echo -n "$(date +%X) 72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -656,7 +648,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 28 27
+  for i in 29 28 27
   do
     echo -n "$(date +%X) 73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -708,7 +700,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 27 28 26
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -734,7 +726,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 27 28 26
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -760,7 +752,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 27 28 26
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -786,7 +778,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 28 26 25
+  for i in 27 28 26
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
@@ -812,11 +804,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 25
-  do
-    echo -n "$(date +%X) scl55 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl55 rebuild $1 && echo " Ok." || echo " Error !"
-  done
   for i in 7 6
   do
     echo -n "$(date +%X) scl55 el$i  "
@@ -838,11 +825,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 25
-  do
-    echo -n "$(date +%X) scl54 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl54 rebuild $1 && echo " Ok." || echo " Error !"
-  done
   for i in 7 6
   do
     echo -n "$(date +%X) scl54 el$i  "
@@ -864,11 +846,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 25
-  do
-    echo -n "$(date +%X) test-fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xt rebuild $1 && echo " Ok." || echo " Error !"
-  done
   for i in 7 6
   do
     echo -n "$(date +%X) test-el$i  "
diff --git a/getmock b/getmock
index 59ad33f..1a75836 100755
--- a/getmock
+++ b/getmock
@@ -219,7 +219,7 @@ if [ $1 = devs -o $1 = dev ]; then
 fi
 
 if [ $1 = all ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28 29
 	do
 		getOneMock fc${i}i $opt
 	done
@@ -257,11 +257,6 @@ elif [ $1 = all70 ]; then
 elif [ $1 = all71 ]; then
 	[ $opt = remi ] && opt=php71
 	[ $opt = test ] && opt=test71
-	for n in 25
-	do
-		getOneMock fc${n}i $opt '*7.1*'
-		getOneMock fc${n}x $opt '*7.1*'
-	done
 	n=6
 		getOneMock el${n}i $opt '*7.1*'
 		getOneMock el${n}x $opt '*7.1*'
@@ -271,7 +266,7 @@ elif [ $1 = all71 ]; then
 elif [ $1 = all72 ]; then
 	[ $opt = remi ] && opt=php72
 	[ $opt = test ] && opt=test72
-	for n in 25 26 27
+	for n in 26 27
 	do
 		getOneMock fc${n}i $opt '*7.2*'
 		getOneMock fc${n}x $opt '*7.2*'
@@ -285,7 +280,7 @@ elif [ $1 = all72 ]; then
 elif [ $1 = all73 ]; then
 	[ $opt = remi ] && opt=php73
 	[ $opt = test ] && opt=test73
-	for n in 27 28
+	for n in 27 28 29
 	do
 		getOneMock fc${n}i $opt '*7.3*'
 		getOneMock fc${n}x $opt '*7.3*'
@@ -318,7 +313,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28 29
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -328,27 +323,19 @@ elif [ $1 = allx ]; then
 	done
 
 elif [ $1 = scl54 ]; then
-	for i in 25
-	do
-		getOneMock scl54fc${i}x $opt
-	done
 	for i in 6 7
 	do
 		getOneMock scl54el${i}x $opt
 	done
 
 elif [ $1 = scl55 ]; then
-	for i in 25
-	do
-		getOneMock scl55fc${i}x $opt
-	done
 	for i in 6 7
 	do
 		getOneMock scl55el${i}x $opt
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28
 	do
 		getOneMock scl56fc${i}x $opt
 	done
@@ -358,7 +345,7 @@ elif [ $1 = scl56 ]; then
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28
 	do
 		getOneMock scl70fc${i}x $opt
 	done
@@ -368,7 +355,7 @@ elif [ $1 = scl70 ]; then
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28
 	do
 		getOneMock scl71fc${i}x $opt
 	done
@@ -388,7 +375,7 @@ elif [ $1 = scl73 ]; then
 	done
 
 elif [ $1 = scl72 ]; then
-	for i in 25 26 27 28
+	for i in 26 27 28
 	do
 		getOneMock scl72fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index b530e1d..745d65d 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -8,7 +8,7 @@ TMPSIG3=$(mktemp)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{24,25,26,27,28}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
+for dep in fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
 do
 	arch=${dep##*/}
 
@@ -36,6 +36,7 @@ if [ -s $TMPSIG ]; then
     grep fc27    $TMPSIG >> $TMPSIG2
 
     grep fc28    $TMPSIG  > $TMPSIG3
+    grep fc29    $TMPSIG  > $TMPSIG3
     grep src.rpm $TMPSIG >> $TMPSIG3
 
     if [ -s $TMPSIG3 ]; then
@@ -52,7 +53,7 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v src.rpm > $TMPSIG1
+	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v src.rpm > $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)
@@ -77,7 +78,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{24,25,26,27,28}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
+for dep in SRPMS fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7}/*/{i386,x86_64,armhfp}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="