From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 12 Mar 2020 09:41:52 +0000 (+0100)
Subject: replace rpm gpg with gpg1 in fedora31
X-Git-Tag: last-complete-build-f29
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=1d2e4d6de0b872cacbad8aa2f72b472f34b21d8a

replace rpm gpg with gpg1 in fedora31
---

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index b9504a3e..53e7e2df 100644
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -42,7 +42,9 @@ package: authconfig
 package: hdparm
 package: lvm2
 package: kexec-tools
-package>=f8 package>=centos5: gnupg
+# see myplc/plc.d/gpg
+package<=f29: gnupg
+package>=f31: gnupg1
 package>=sl6: gnupg2
 package: nano
 package: parted
diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 4bde5893..12b398c6 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -42,7 +42,9 @@ package: dnsmasq
 # for spec2make / rpmlib
 package=f8: popt-devel
 # kernel
-package: gnupg
+# see myplc/plc.d/gpg
+package<=f29: gnupg
+package>=f31: gnupg1
 package: diffutils
 package: patchutils
 package: vconfig