moving to f12

diff --git a/bootstrapfs-sge.pkgs b/bootstrapfs-sge.pkgs
index 4d8157f..1a8c47e 100644 (file)
--- a/bootstrapfs-sge.pkgs
+++ b/bootstrapfs-sge.pkgs
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+#

 # those ones are for the record, they are required by sge anyway
 package: java-1.6.0-openjdk 
 package: kdevelop kdevelop-devel kdevelop-libs
 # those ones are for the record, they are required by sge anyway
 package: java-1.6.0-openjdk 
 package: kdevelop kdevelop-devel kdevelop-libs

diff --git a/bootstrapfs.pkgs b/bootstrapfs.pkgs
index 01e2d3b..a8601a1 100644 (file)
--- a/bootstrapfs.pkgs
+++ b/bootstrapfs.pkgs
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+#

 # Keeping the old name as it might be referenced elsewhere (node update..)
 # groupname: Bootstrapfs
 groupname: PlanetLab
 # Keeping the old name as it might be referenced elsewhere (node update..)
 # groupname: Bootstrapfs
 groupname: PlanetLab

diff --git a/devel.pkgs b/devel.pkgs
index 608724d..9b04582 100644 (file)
--- a/devel.pkgs
+++ b/devel.pkgs
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+#

 groupname: PlanetLabDevel
 groupdesc: Building PlanetLab
 # general utilities
 groupname: PlanetLabDevel
 groupdesc: Building PlanetLab
 # general utilities


@@ -37,7 +40,7 @@ package: ncurses-devel
 package: readline-devel 
 package: dnsmasq 
 # for spec2make / rpmlib
 package: readline-devel 
 package: dnsmasq 
 # for spec2make / rpmlib

-package+f8: popt-devel
+package=f8: popt-devel

 # kernel
 package: gnupg 
 package: diffutils 
 # kernel
 package: gnupg 
 package: diffutils 


@@ -79,16 +82,14 @@ package: pciutils-devel
 # for vsys - same as for php-devel above
 package: ocaml.@arch@ ocaml-docs 
 # use local inotify-tools on centos
 # 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
+package>=f8:inotify-tools-devel 

 ##########
 ## for util-vserver-pl
 # use local libnl on centos
 ##########
 ## for util-vserver-pl
 # use local libnl on centos

-package: libnl-devel
-package-centos5: libnl-devel
+package>=f8: libnl-devel

 # zabbix/monitor
 package: net-snmp net-snmp-devel
 # zabbix/monitor
 package: net-snmp net-snmp-devel

-package+centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
+package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@

 package: TurboGears
 package: python-cherrypy
 ##########
 package: TurboGears
 package: python-cherrypy
 ##########

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index cc000cb..4efc6a3 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -1,9 +1,10 @@
 # $Id$
 # $Id$

+# $URL$

 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 boost-SVNPATH                  := http://svn.onelab.eu/boost/tags/boost-1.37.0-6
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 boost-SVNPATH                  := http://svn.onelab.eu/boost/tags/boost-1.37.0-6

-gnuradio-SVNPATH               := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-21
+gnuradio-SVNPATH               := http://svn.onelab.eu/gnuradio/trunk

 bbn_80211-SVNPATH              := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-1
 crunchxml-SVNPATH              := http://svn.onelab.eu/crunchxml/tags/crunchxml-1.1-1
 spectools-SVNPATH              := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1
 bbn_80211-SVNPATH              := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-1
 crunchxml-SVNPATH              := http://svn.onelab.eu/crunchxml/tags/crunchxml-1.1-1
 spectools-SVNPATH              := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1