git://git.onelab.eu
/
plnode-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
take back version bump to unbreak module-tag
[plnode-utils.git]
/
plnode-utils-vs.spec
diff --git
a/plnode-utils-vs.spec
b/plnode-utils-vs.spec
index
4f1af77
..
2ebb2de
100644
(file)
--- a/
plnode-utils-vs.spec
+++ b/
plnode-utils-vs.spec
@@
-4,6
+4,9
@@
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%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}
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
%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
%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
%clean
rm -rf $RPM_BUILD_ROOT
@@
-44,6
+49,6
@@
rm -rf $RPM_BUILD_ROOT
%files
%{python_sitelib}/*
%files
%{python_sitelib}/*
-%{_bindir}
+%{_bindir}
/*
%changelog
%changelog