From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 11 Jan 2014 10:33:54 +0000 (+0100)
Subject: review rpms names across distros
X-Git-Tag: before_libvirt_121~77
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=dc1cb1d4ab844beda205380ffbbedb061e301d4c

review rpms names across distros
---

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index cc3c9eaf..ca640912 100644
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -5,7 +5,7 @@ yumexclude: @NODEYUMEXCLUDE@
 # define packages
 package: btrfs-progs
 package: filesystem
-package: udev
+package<=f18: udev
 package: dhclient
 package: bash
 package: coreutils
diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 31a13bfb..117f3230 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -30,7 +30,7 @@ package: metadata
 package: mysql mysql-devel mysql-server 
 package: python python-devel 
 package: doxygen  
-package: vixie-cron 
+package: cronie
 package: xmlsec1 xmlsec1-openssl 
 package: udev 
 package: expat-devel
@@ -82,7 +82,7 @@ package: postgresql postgresql-devel postgresql-python postgresql-server
 package: php php-devel.@arch@ php-gd php-pgsql 
 # now this seems to have been fixed in f12
 package>=f12: php-devel
-package: PyXML 
+package<=f18: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 66bbd04e..c87f6d26 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -89,7 +89,7 @@ package: expect
 package: nfs-utils
 package: openvpn
 package: vconfig
-package: PyXML
+package<=f18: PyXML
 
 #
 # platform-dependent
diff --git a/config.lxc/sliceimage.pkgs b/config.lxc/sliceimage.pkgs
index 3c04b442..a83a91b0 100644
--- a/config.lxc/sliceimage.pkgs
+++ b/config.lxc/sliceimage.pkgs
@@ -13,8 +13,9 @@ package: perl
 package: python python-devel
 package: yum
 package: iputils
-package: tcpdump traceroute 
-package: telnet nc
+package: tcpdump traceroute telnet
+package<=f18: nc
+package>=f20: nmap-ncat
 package: openssh-clients
 package: time
 # this is really old school but well..
diff --git a/config.mlab/devel.pkgs b/config.mlab/devel.pkgs
index 5e51b485..75bcef05 100644
--- a/config.mlab/devel.pkgs
+++ b/config.mlab/devel.pkgs
@@ -30,7 +30,7 @@ package: metadata
 package: mysql mysql-devel mysql-server 
 package: python python-devel 
 package: doxygen  
-package: vixie-cron 
+package: cronie 
 package: xmlsec1 xmlsec1-openssl 
 package: udev 
 package: expat-devel
@@ -82,7 +82,7 @@ package: postgresql postgresql-devel postgresql-python postgresql-server
 package: php php-devel.@arch@ php-gd php-pgsql 
 # now this seems to have been fixed in f12
 package>=f12: php-devel
-package: PyXML 
+package<=f18: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
diff --git a/config.mlab/nodeimage.pkgs b/config.mlab/nodeimage.pkgs
index 7ec426b6..fae3b30d 100644
--- a/config.mlab/nodeimage.pkgs
+++ b/config.mlab/nodeimage.pkgs
@@ -83,7 +83,7 @@ package: expect
 package: nfs-utils
 package: openvpn
 package: vconfig
-package: PyXML
+package<=f18: PyXML
 
 #
 # platform-dependent
diff --git a/config.onelab/nodeimage.pkgs b/config.onelab/nodeimage.pkgs
index 6745f4df..18541898 100644
--- a/config.onelab/nodeimage.pkgs
+++ b/config.onelab/nodeimage.pkgs
@@ -83,7 +83,7 @@ package: expect
 package: nfs-utils
 package: openvpn
 package: vconfig
-package: PyXML
+package<=f18: PyXML
 
 #
 # platform-dependent
diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 5e51b485..75bcef05 100644
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -30,7 +30,7 @@ package: metadata
 package: mysql mysql-devel mysql-server 
 package: python python-devel 
 package: doxygen  
-package: vixie-cron 
+package: cronie 
 package: xmlsec1 xmlsec1-openssl 
 package: udev 
 package: expat-devel
@@ -82,7 +82,7 @@ package: postgresql postgresql-devel postgresql-python postgresql-server
 package: php php-devel.@arch@ php-gd php-pgsql 
 # now this seems to have been fixed in f12
 package>=f12: php-devel
-package: PyXML 
+package<=f18: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
diff --git a/config.planetlab/nodeimage.pkgs b/config.planetlab/nodeimage.pkgs
index bc33eabe..0879fcbc 100644
--- a/config.planetlab/nodeimage.pkgs
+++ b/config.planetlab/nodeimage.pkgs
@@ -83,7 +83,7 @@ package: expect
 package: nfs-utils
 package: openvpn
 package: vconfig
-package: PyXML
+package<=f18: PyXML
 
 #
 # platform-dependent