X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=plnode-utils-vs.spec;h=81d8921383453cc7d5fc26991fa7fa107d100ceb;hb=HEAD;hp=18290d04336686fc5fe955ef5f717b5ba4ac2034;hpb=bfd20f8b235c56039fda4caa01d066d096674b42;p=plnode-utils.git

diff --git a/plnode-utils-vs.spec b/plnode-utils-vs.spec
index 18290d0..81d8921 100644
--- a/plnode-utils-vs.spec
+++ b/plnode-utils-vs.spec
@@ -1,11 +1,10 @@
 %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()")}
+%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}
@@ -24,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
@@ -33,10 +32,12 @@ This python package provides utilities like bwlimit, used in various places on a
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped
 cp plnode/bwlimit_vs.py plnode/bwlimit.py
-python setup.py build
+# 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
@@ -46,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.