X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnode-utils-vs.spec;h=81d8921383453cc7d5fc26991fa7fa107d100ceb;hb=refs%2Fheads%2Fmaster;hp=4f1af77c1db5344acb0420d4f162b73676871217;hpb=ddebc5dafa9a78f4ff3b6cfa750428833a5b2eeb;p=plnode-utils.git

diff --git a/plnode-utils-vs.spec b/plnode-utils-vs.spec
index 4f1af77..81d8921 100644
--- a/plnode-utils-vs.spec
+++ b/plnode-utils-vs.spec
@@ -1,9 +1,11 @@
 %define name plnode-utils
 %define version 0.2
-%define taglevel 1
+%define taglevel 2
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
+%define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+
 Summary: Python utilities for a PlanetLab node
 Name: %{name}
 Version: %{version}
@@ -21,7 +23,7 @@ URL: %{SCMURL}
 Provides: bwlimit
 
 %description
-This python package provides utilities like bwlimit, used in various places on a PlanetLab node, nodemanager and mom among others. It aims at cleaning up the packaging scheme, as bwlimit used to ship with util-vserver-pl, but is relevant in the lxc variant as well.
+This python3 package provides utilities like bwlimit, used in various places on a PlanetLab node, nodemanager and mom among others. It aims at cleaning up the packaging scheme, as bwlimit used to ship with util-vserver-pl, but is relevant in the lxc variant as well.
 
 %prep
 %setup -q
@@ -29,11 +31,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
+python3 setup.py build
 
 %install
-python setup.py install --skip-build --root "$RPM_BUILD_ROOT"
+python3 setup.py install --skip-build --root "$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/bwlimit init
 
 %files
-%{python_sitelib}/*
-%{_bindir}
+%{python3_sitelib}/*
+%{_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.