trim build image components that involve python2 rpms that no longer make sense

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

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 5e476f3..26e4a27 100644 (file)
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -28,19 +28,23 @@ 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
 package: xmlsec1 xmlsec1-openssl
 package: expat-devel
-package: db4-devel
 package: ncurses-devel
 package: readline-devel
 package: dnsmasq
+package <= f31: db4-devel
 # 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
@@ -113,14 +117,19 @@ package>=f16: kernel-modules-extra
 package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 ##########
 # for sfa : rebuilding wsdl index at build-time
-package<=f25: python-uuid
-package: pyOpenSSL m2crypto
-package: libxml2-python libxslt-python
-package<=f27: python-ZSI
-package: python-psycopg2
-package: python-setuptools
-package: python-dateutil
-package: python-lxml
+# removing from the build image, defer installation
+# that depends on the flavour of python2 or 3
+# + in f33 the rpms primarily are gone
+#package<=f25: python-uuid
+#package: pyOpenSSL m2crypto
+#package: libxml2-python libxslt-python
+#package<=f27: python-ZSI
+#package: python2-psycopg2
+#package: python2-setuptools
+#package: python2-dateutil
+#package: python2-lxml
+# hopefully temporary, for sfa@python2
+#package>=f29: python2-dateutil python2-lxml
 # DistributedRateLimiting
 package: libxml2-devel
 # myplc-docs
@@ -134,6 +143,6 @@ package: libgcrypt-devel
 package: libtasn1-devel
 package: nmap-ncat
 package: pkgconfig
-# f29
-package>=f29: NetworkManager
+# f29; and needed on f27 so the spawned container actually starts its networking
+package>=f27: NetworkManager
 package>=f29: hostname