From 570ed9064e687d625e942344a6627d0c62f70e79 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 10 Feb 2022 13:54:16 +0100
Subject: F36 helpers

---
 mkallrepo | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'mkallrepo')

diff --git a/mkallrepo b/mkallrepo
index 49e6e93..8c2d1ee 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,10 +7,11 @@ TMPSIG3=$(mktemp -t XXXXXXXX.2018)
 TMPSIG4=$(mktemp -t XXXXXXXX.2019)
 TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
 TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
+TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -51,39 +52,48 @@ if [ -s $TMPSIG ]; then
     grep fc34    $TMPSIG  > $TMPSIG2021
     grep fc35    $TMPSIG >> $TMPSIG2021
     grep el9     $TMPSIG >> $TMPSIG2021
-    grep src.rpm $TMPSIG >> $TMPSIG2021
+	# 2022
+    grep fc36    $TMPSIG  > $TMPSIG2022
+    grep src.rpm $TMPSIG >> $TMPSIG2022
 
+    if [ -s $TMPSIG2022 ]; then
+		echo "== Signature des $(cat $TMPSIG2022 | wc -l) nouveaux RPM (2022) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 845160D23149DAD504F0A32D83C0639E1FEF0014" --addsign $(cat $TMPSIG2022)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
     if [ -s $TMPSIG2021 ]; then
 		echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2021)
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     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)
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name 34C10BDBCC6F1B252E50BA1A0714919E4C21A808" --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)
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name 5F136145BF10369B7685D8DE503666CCBBAE6F1B" --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)
+		if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG3)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     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)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG1)
 		then	echo done.
 		else 	exit 1
 		fi
@@ -106,7 +116,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{33,34,35}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
-- 
cgit