X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fdevel.pkgs;h=1ea1c270d3b69c8f4762aa497da23801a962b366;hb=02de63041c4526ce0bcdfb38314c589a25eb3ec6;hp=b836e0cb883b8f8ecf963a7aab5a97499d3e27e9;hpb=50cb225f21f322f49d4ff1a20b7fb5f3e78e0339;p=build.git

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index b836e0cb..1ea1c270 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -1,6 +1,11 @@
+# $Id$
+# $URL$
+#
+groupname: PlanetLabDevel
+groupdesc: Building PlanetLab
 # general utilities
 package: sendmail sendmail-cf mailx 
-package: make install 
+package: make 
 package: glibc glibc-common 
 package: bzip2 gzip
 package: cpio tar
@@ -17,6 +22,9 @@ package: expect
 package: gd 
 package: httpd mod_python mod_ssl 
 package: openssl 
+package: openssl-devel
+package: zlib
+package: zlib-devel
 package: bison flex
 package: libtool 
 package: metadata 
@@ -25,32 +33,25 @@ package: python python-devel
 package: doxygen  
 package: vixie-cron 
 package: xmlsec1 xmlsec1-openssl 
-package: dev 
+package: udev 
 package: expat-devel
 package: db4-devel 
 package: ncurses-devel 
 package: readline-devel 
 package: dnsmasq 
 # for spec2make / rpmlib
-package+f8: popt-devel
+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
@@ -70,13 +71,41 @@ 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 
+# now this seems to have been fixed in f12
+package>=f12: php-devel
 package: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
-# for vsys
-package: ocaml ocaml-docs
-package: inotify-tools-devel 
-# for bootstrapfs & useradd
-package: shadow-utils
+##########
+# for vsys - same as for php-devel above
+package: ocaml.@arch@ ocaml-docs 
+# use local inotify-tools on centos
+package>=f8:inotify-tools-devel 
+##########
+## for util-vserver-pl
+# use local libnl on centos
+package>=f8: libnl-devel
+# for util-vserver
+package: ctags
+package>=f12: e2fsprogs-devel
+# zabbix/monitor
+package: net-snmp net-snmp-devel
+package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
+package: python-cherrypy
+##########
+# for sfa : rebuilding wsdl index at build-time
+package: python-uuid pyOpenSSL m2crypto
+package: libxml2-python libxslt-python
+package: python-ZSI 
+package: python-psycopg2
+package: python-setuptools
+# DistributedRateLimiting
+package: libxml2-devel
+# for ejabberd
+package: erlang
+package: pam-devel
+package: hevea