X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pyplnet.spec;h=a2a54a4b4ebefae6afdcfd3fa022037fdba2e8c2;hb=96f5dad22708ec95d4dacbf6f477c32a785b0b7c;hp=bf443ee9c8e2ae4bb72c7edb512e1e3f47bdd9fa;hpb=0a2d962b3b9c396f45b6ef3e1d435bb63b83a15d;p=pyplnet.git

diff --git a/pyplnet.spec b/pyplnet.spec
index bf443ee..a2a54a4 100644
--- a/pyplnet.spec
+++ b/pyplnet.spec
@@ -5,11 +5,11 @@
 
 %define name pyplnet
 %define version 4.3
-%define taglevel 0
+%define taglevel 3
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: PlanetLab Network Configuration library
 Name: %{name}
@@ -27,6 +27,7 @@ URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Requires: python >= 2.4
 BuildRequires: python, python-devel
+BuildArch: noarch
 
 %description
 pyplnet is used to write the network configuration files based on the
@@ -41,14 +42,28 @@ python setup.py build
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install --skip-build --root "$RPM_BUILD_ROOT"
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/plnet.py
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+ln -s %{python_sitelib}/plnet.py $RPM_BUILD_ROOT/%{_bindir}/plnet
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{python_sitearch}/*
+%{_bindir}/plnet
+%{python_sitelib}/*
 
 %changelog
+* Tue Jun 09 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - pyplnet-4.3-3
+- this patch addresses mlab and other multi-interface node confgurations where
+- the generated boot image and network config files are mis-named.
+
+* Wed Apr 22 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pyplnet-4.3-2
+- handle wireless settings back again
+
+* Fri Apr 17 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pyplnet-4.3-1
+- fixes for 4.3
+
 * Tue Dec  2 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - pyplnet-4.3-1
 - initial release