X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=bd51351200fa71de0051163d04715d752ba1c533;hb=d13ca5774e1839f4ed3c65fc48c1ffacc849a160;hp=31c66a6f8dd8e579f219357b543edcaeb657b9ee;hpb=3bef953f58080c812db1c7cf5204384d2762c263;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 31c66a6..bd51351 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name	util-vserver-pl
 %define version 0.4
-%define taglevel 26
+%define taglevel 27
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -23,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Requires: util-vserver util-vserver-core util-vserver-build util-vserver-sysv
 Provides: util-vserver-python = %{version}-%{release}
@@ -74,8 +69,6 @@ if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
 	echo /bin/vsh >> /etc/shells
 fi
 
-/usr/sbin/bwlimit init
-
 # Migrate old style vservers to new style
 pushd /etc/vservers
 for i in `ls /etc/vservers` 
@@ -128,7 +121,6 @@ rm -fr %{buildroot}
 
 %files -f %name-python.list
 %defattr(-,root,root,-)
-%{_sbindir}/bwlimit
 %{_sbindir}/disklimit
 %{_sbindir}/vuseradd
 %{_sbindir}/vuserdel
@@ -141,6 +133,9 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-27
+- bwlimit now ships with plnode-utils
+
 * Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-26
 - added support for loopback isolation