Merge branch 'master' of git.onelab.eu:/git/plewww

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index d162442..dedddf1 100644 (file)
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -77,7 +77,6 @@ if ($profiling) plc_debug_prof('3: peers',count($peers));
 $sites= $api->GetSites( array( $site_id ) );
 $site=$sites[0];
 $site_name= $site['name'];
-$max_slices = $site['max_slices'];
 
 if ($profiling) plc_debug_prof('4: sites',count($sites));
 //////////////////////////////////////// building blocks for the renew area

diff --git a/plewww.spec b/plewww.spec
index 7cbe423..3d67952 100644 (file)
--- a/plewww.spec
+++ b/plewww.spec
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 # what the myplc rpm requires
 %define name plewww
 %define version 4.3
@@ -25,7 +21,7 @@ BuildRequires: python
 Vendor: OneLab
 Packager: OneLab <support@one-lab.org>
 Distribution: PlanetLab %{version}
-URL: http://svn.one-lab.org/svn/new_plc_www/
+URL: %{SCMURL}
 
 # We use set everywhere
 #Requires: httpd >= 2.0