X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fdevel.pkgs;h=526f7d1408b4d43edfc038d4b5c9695ff0e05707;hb=cda9ee4297e4e33c12e2ebf8f54c72f77e05bcca;hp=916196a199ba90161a85c7ab7595723c0521cee0;hpb=00fe672fd3075d93e4de85f169c98295de016188;p=build.git

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 916196a1..526f7d14 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -41,21 +41,14 @@ package+f8: popt-devel
 # kernel
 package: gnupg 
 package: diffutils 
-# util-vserver-pl
 package: vconfig 
 package: iptables 
 package: wget 
 package: beecrypt-devel 
 package: tetex-latex
 package: gcc-c++ 
-#package: util-vserver-lib
-#package: util-vserver-devel
-#package: util-vserver-core
-# ulogd
-package: libpcap libpcap-devel 
 # iptables
 package: linuxdoc-tools 
-# vserver-reference
 package: sudo 
 package: yum createrepo 
 # mysql
@@ -75,11 +68,29 @@ package: ghostscript
 # PLCAPI
 package: docbook-utils-pdf 
 package: postgresql postgresql-devel postgresql-python postgresql-server 
-package: php php-devel php-gd php-pgsql 
+# 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 
 package: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
-# for vsys
-package: ocaml ocaml-docs
-package: inotify-tools-devel 
+##########
+# for vsys - same as for php-devel above
+package: ocaml.@arch@ ocaml-docs 
+# use local inotify-tools on centos
+package:inotify-tools-devel 
+package-centos5: inotify-tools-devel
+##########
+## for util-vserver-pl
+# use local libnl on centos
+package: libnl-devel
+package-centos5: libnl-devel
+# zabbix/monitor
+package: net-snmp net-snmp-devel
+package+centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
+package: TurboGears
+package: python-cherrypy
+##########
+# for sfa : rebuilding wsdl index at build-time
+package: python-uuid pyOpenSSL m2crypto