X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.lxc%2Fdevel.pkgs;h=d0259d67ca526507f3a65d15e51d6d4d688c3152;hb=9e8cd03fe373a87a8682a422bde7995c69cd0a8c;hp=76cbabfedc8b56c35334c4909b0f4cd97f821b22;hpb=0087538b2a893b0267f5b87b6a075331386b3a52;p=build.git

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 76cbabfe..d0259d67 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -28,20 +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
@@ -78,7 +81,8 @@ package: ghostscript
 package: ed
 package: docbook-utils-pdf
 # plcapi
-package: postgresql postgresql-devel postgresql-python postgresql-server
+package: postgresql postgresql-devel postgresql-server
+package<=f31: postgresql-python
 # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
 # in an undetermined order, and php-config --extension-dir might return the wrong place
 package: php php-devel.@arch@ php-gd php-pgsql
@@ -114,14 +118,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