replace rpm gpg with gpg1 in fedora31

[build.git] / config.lxc / devel.pkgs

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 76cbabf..12b398c 100644 (file)
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -28,7 +28,8 @@ package: bison flex
 package: libtool
 package<=f21: metadata
 package: mysql mysql-devel mysql-server
-package: python python-devel
+package<=f27: python python-devel
+package>=f29: python2 python-unversioned-command python2-devel
 package: python3 python3-devel
 package: doxygen
 package: cronie
@@ -41,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
@@ -122,6 +125,8 @@ package: python-psycopg2
 package: python-setuptools
 package: python-dateutil
 package: python-lxml
+# hopefully temporary, for sfa@python2
+package>=f29: python2-dateutil python2-lxml
 # DistributedRateLimiting
 package: libxml2-devel
 # myplc-docs