X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnode-utils-vs.spec;h=7dd6c1679112cbe112761a700ac17f9188fc3b76;hb=9f52e2852c4f11533d0cece022aa7c8d171e749c;hp=ac40a8701ed705cdcc3bd1288be76073a7a64c12;hpb=a763f46c558a14a0b0be5cae6deb633cef64685e;p=plnode-utils.git

diff --git a/plnode-utils-vs.spec b/plnode-utils-vs.spec
index ac40a87..7dd6c16 100644
--- a/plnode-utils-vs.spec
+++ b/plnode-utils-vs.spec
@@ -1,9 +1,12 @@
 %define name plnode-utils
 %define version 0.2
-%define taglevel 1
+%define taglevel 2
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
+# for f12
+%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: Python utilities for a PlanetLab node
 Name: %{name}
 Version: %{version}
@@ -29,17 +32,26 @@ This python package provides utilities like bwlimit, used in various places on a
 %build
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped
-cp bwlimit_vs.py bwlimit.py
-python setup.py build
+cp plnode/bwlimit_vs.py plnode/bwlimit.py
+# for backwards compatibilty until legacy packages import from plnode
+cp plnode/bwlimit_vs.py bwlimit.py
+/usr/bin/python setup.py build
 
 %install
-python setup.py install --skip-build --root "$RPM_BUILD_ROOT"
+/usr/bin/python setup.py install --skip-build --root "$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# moved from util-vserver-pl package
+%post
+/usr/bin/bwlimit init
+
 %files
 %{python_sitelib}/*
-%{_bindir}
+%{_bindir}/*
 
 %changelog
+* Mon Feb 11 2013 Stephen Soltesz <soltesz@opentechinstitute.org> - plnode-utils-0.2-2
+- import bwlimit from plnode dir, and keep legacy support.
+