From 40ad08178b7972683895cbdb7297181b465531a4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 1 Mar 2019 14:30:26 +0100
Subject: -F26 +F30

---
 mkallrepo | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'mkallrepo')

diff --git a/mkallrepo b/mkallrepo
index 3614754..6a332a3 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -2,13 +2,14 @@
 
 TMPSIG=$(mktemp)
 TMPLNK=$(mktemp)
-TMPSIG1=$(mktemp)
-TMPSIG2=$(mktemp)
-TMPSIG3=$(mktemp)
+TMPSIG1=$(mktemp -t XXXXXXXX.2000)
+TMPSIG2=$(mktemp -t XXXXXXXX.2017)
+TMPSIG3=$(mktemp -t XXXXXXXX.2018)
+TMPSIG4=$(mktemp -t XXXXXXXX.2019)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	arch=${dep##*/}
 
@@ -38,8 +39,17 @@ if [ -s $TMPSIG ]; then
     grep fc28    $TMPSIG  > $TMPSIG3
     grep fc29    $TMPSIG >> $TMPSIG3
     grep el8     $TMPSIG >> $TMPSIG3
-    grep src.rpm $TMPSIG >> $TMPSIG3
 
+    grep fc30    $TMPSIG  > $TMPSIG4
+    grep src.rpm $TMPSIG >> $TMPSIG4
+
+    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)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
     if [ -s $TMPSIG3 ]; then
 		echo "== Signature des $(cat $TMPSIG3 | wc -l) nouveaux RPM (2018) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG3)
@@ -54,7 +64,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 src.rpm | grep -v el8 > $TMPSIG1
+	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | 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)
@@ -79,7 +89,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in SRPMS fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="
-- 
cgit