X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pyplnet.spec;h=b4ddc5590c10e776c61950b7d40b560133b31882;hb=b68e552baa4681c984beb06038bac318abdf23e8;hp=cb3a56897dca636d1b76a0c70c661f037d680b44;hpb=18aa0460718e2a8cc3411fe0efee7844d6587a6f;p=pyplnet.git diff --git a/pyplnet.spec b/pyplnet.spec index cb3a568..b4ddc55 100644 --- a/pyplnet.spec +++ b/pyplnet.spec @@ -1,15 +1,10 @@ -# -# $Id$ -# -%define url $URL$ - %define name pyplnet %define version 4.3 -%define taglevel 0 +%define taglevel 9 %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} @@ -23,10 +18,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Requires: python >= 2.4 BuildRequires: python, python-devel +BuildArch: noarch %description pyplnet is used to write the network configuration files based on the @@ -41,9 +37,9 @@ 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_sitearch}/plnet.py -mkdir -p $RPM_BUILD_ROOT/%{_bindir}/plnet -ln -s %{python_sitearch}/plnet.py $RPM_BUILD_ROOT/%{_bindir}/plnet +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 @@ -51,8 +47,38 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/plnet -%{python_sitearch}/* +%{python_sitelib}/* %changelog +* Tue Feb 15 2011 Thierry Parmentelat - pyplnet-4.3-9 +- protect shell vars definition in ifcfg files with "" +- tweaks in numbering rules + +* Mon Jan 24 2011 Thierry Parmentelat - pyplnet-4.3-8 +- no semantic change - just fixed specfile for git URL + +* Thu Dec 09 2010 Daniel Hokka Zakrisson - pyplnet-4.3-7 +- Secondary interface fixes and features. + +* Wed Apr 28 2010 Thierry Parmentelat - pyplnet-4.3-6 +- aliases don't show up in /sys, so use /sbin/ip to get the configured IP addresses instead + +* Thu Feb 11 2010 Thierry Parmentelat - pyplnet-4.3-5 +- This is needed for 5.0, as GetSlivers now exposes 'interfaces' and no 'networks' anymore +- this code can handle both.. + +* Tue Sep 29 2009 Thierry Parmentelat - pyplnet-4.3-4 +- alias without a mac address: fix runtime error while issuing warning + +* Tue Jun 09 2009 Stephen Soltesz - 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 - pyplnet-4.3-2 +- handle wireless settings back again + +* Fri Apr 17 2009 Thierry Parmentelat - pyplnet-4.3-1 +- fixes for 4.3 + * Tue Dec 2 2008 Daniel Hokka Zakrisson - pyplnet-4.3-1 - initial release