X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnode-utils-vs.spec;h=d946422b54b5baba64360f5e892015a7ed566081;hb=dc261e341992658555e3823ed086b9a72fc09dfd;hp=4f1af77c1db5344acb0420d4f162b73676871217;hpb=ddebc5dafa9a78f4ff3b6cfa750428833a5b2eeb;p=plnode-utils.git

diff --git a/plnode-utils-vs.spec b/plnode-utils-vs.spec
index 4f1af77..d946422 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,11 +32,13 @@ 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
@@ -44,6 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %{python_sitelib}/*
-%{_bindir}
+%{_bindir}/*
 
 %changelog