From 5d81899fa24171faf319f0c5822150dc9cbe51a2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 17 Feb 2020 16:16:01 +0100
Subject: Close F29 and Open F32

---
 mkallrepo | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'mkallrepo')

diff --git a/mkallrepo b/mkallrepo
index 0b14f84..c442df0 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -6,10 +6,11 @@ TMPSIG1=$(mktemp -t XXXXXXXX.2000)
 TMPSIG2=$(mktemp -t XXXXXXXX.2017)
 TMPSIG3=$(mktemp -t XXXXXXXX.2018)
 TMPSIG4=$(mktemp -t XXXXXXXX.2019)
+TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -40,8 +41,17 @@ if [ -s $TMPSIG ]; then
 
     grep fc30    $TMPSIG  > $TMPSIG4
     grep fc31    $TMPSIG >> $TMPSIG4
-    grep src.rpm $TMPSIG >> $TMPSIG4
 
+    grep fc32    $TMPSIG  > $TMPSIG2020
+    grep src.rpm $TMPSIG >> $TMPSIG2020
+
+    if [ -s $TMPSIG2020 ]; then
+		echo "== Signature des $(cat $TMPSIG2020 | wc -l) nouveaux RPM (2020) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2020)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
     if [ -s $TMPSIG4 ]; then
 		echo "== Signature des $(cat $TMPSIG4 | wc -l) nouveaux RPM (2019) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG4)
@@ -56,7 +66,7 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | grep -v fc31 | grep -v src.rpm | grep -v el8 > $TMPSIG1
+	grep -v fc29 $TMPSIG | grep -v fc30 | grep -v fc31 | grep -v fc32 | 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)
@@ -82,7 +92,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
-- 
cgit