From 5d81899fa24171faf319f0c5822150dc9cbe51a2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Feb 2020 16:16:01 +0100 Subject: Close F29 and Open F32 --- mkrepo | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'mkrepo') diff --git a/mkrepo b/mkrepo index 68a788d..91a70fa 100755 --- a/mkrepo +++ b/mkrepo @@ -20,7 +20,11 @@ if [ ${1:-check} != nocheck ]; then rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP if [ -s $TMP ] then - if [ "$dis" == "fedora" -a "$ver" -ge 30 ] + if [ "$dis" == "fedora" -a "$ver" -ge 32 ] + then echo "key 2020" + rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP) + + elif [ "$dis" == "fedora" -a "$ver" -ge 30 ] then echo "key 2019" rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP) @@ -84,12 +88,12 @@ else --database . fi -echo "+ Génération repoview" -nom=${PWD#/home/rpmbuild/site/rpms/} +#echo "+ Génération repoview" +#nom=${PWD#/home/rpmbuild/site/rpms/} #echo repoview --quiet --url http://rpms.remirepo.net/$nom \ # --template-dir /home/rpmbuild/site/rpms/repotmpl \ # --title "Remi's RPM repository - ${nom//\// - }" . -LANG=C repoview --quiet --url http://rpms.remirepo.net/$nom \ - --template-dir /home/rpmbuild/site/rpms/repotmpl \ - --title "Remi's RPM repository - ${nom//\// - }" . +#LANG=C repoview --quiet --url http://rpms.remirepo.net/$nom \ +# --template-dir /home/rpmbuild/site/rpms/repotmpl \ +# --title "Remi's RPM repository - ${nom//\// - }" . -- cgit