incorporate changelog from 2.0

diff --combined nodemanager-lib.spec
index 3fd5b9c,eb54716..2974293
--- 1/nodemanager-lib.spec
--- 2/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@@ -1,11 -1,10 +1,11 @@@
  %define slicefamily %{pldistro}-%{distroname}-%{_arch}
  
  %define name nodemanager-lib
 -%define version 2.0
 -%define taglevel 38
 +%define version 2.1
 +%define taglevel 3
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 +%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
  
  Summary: PlanetLab Node Manager Library
  Name: %{name}
@@@ -55,7 -54,6 +55,7 @@@ either nodemanager-vs or nodemanager-lx
  # make manages the C and Python stuff
  rm -rf $RPM_BUILD_ROOT
  %{__make} %{?_smp_mflags} install-lib DESTDIR="$RPM_BUILD_ROOT"
 +PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
  
  # install the sliver initscript (that triggers the slice initscript if any)
  mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
@@@ -69,8 -67,6 +69,8 @@@ chmod 755 $RPM_BUILD_ROOT/%{_initrddir}
  install -d -m 755 $RPM_BUILD_ROOT/var/lib/nodemanager
  
  install -D -m 644 logrotate/nodemanager $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nodemanager
 +install -D -m 755 sshsh $RPM_BUILD_ROOT/bin/sshsh
 +install -D -m 644 bwlimitlxc.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/bwlimitlxc.py
  
  ##########
  %post
@@@ -128,19 -124,11 +128,22 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimitlxc.py*
  
  %changelog
+ * Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-38
+ - split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib
+ 
 +* Mon Jun 25 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-3
 +- renamed bwlimit as bwlimitlxc to avoid conflicts with util-vserver-pl
 +- purpose being to be able to run this branch on vserver nodes as well
 +
 +* Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-2
 +- merged nodemanager-2.0-37 in 2.1/lxc_devel and add initscript support to lxc
 +- passes tests with lxc but won't build against vs due to conflict
 +- as bwlimit.py also ships with util-vserver-pl
 +
  * Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-37
  - refactoring: isolate initscript functionality
  - aimed at making initscript implementation with lxc straightforward
@@@ -150,10 -138,6 +153,10 @@@
  * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-36
  - /var/log/nodemanager shows duration of mainloop
  
 +* Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-1
 +- first working draft for dealing with libvirt/lxc on f16 nodes
 +- not expected to work with mainline nodes (use 2.0 for that for now)
 +
  * Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-35
  - remove Requires to deprecated vserver-* rpms, use sliceimage-* instead
  

diff --combined nodemanager-vs.spec
index e0575c6,b68706c..8745a3a
--- 1/nodemanager-vs.spec
--- 2/nodemanager-vs.spec
+++ b/nodemanager-vs.spec
@@@ -1,11 -1,11 +1,11 @@@
  # we define this in a separate specfile because we cannot produce all the 3 packages
 -# nodemanager-lib nodemanager-vs nodemanager-vs in a single build
 +# nodemanager-lib nodemanager-vs nodemanager-lxc in a single build
  
  %define slicefamily %{pldistro}-%{distroname}-%{_arch}
  
  %define name nodemanager-vs
 -%define version 2.0
 -%define taglevel 38
 +%define version 2.1
 +%define taglevel 3
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -26,14 -26,14 +26,14 @@@ URL: %{SCMURL
  # old name, when all came as a single package with vserver wired in
  Obsoletes: NodeManager
  
 -# Uses function decorators
 -Requires: nodemanager-lib
 -# vserver-sliceimage or lxc-sliceimage to be added explicitly in nodeimage.pkgs
 -Requires: vserver-sliceimage
  # our interface to the vserver patch
  Requires: util-vserver >= 0.30.208-17
 -# vserver.py
 +# and the planetlab utilities
  Requires: util-vserver-python > 0.3-16
 +# the common package for nodemanager
 +Requires: nodemanager-lib
 +# the vserver-specific tools for using slice images
 +Requires: vserver-sliceimage
  
  %description
  nodemanager-vs provides the vserver code for the PlanetLab Node Manager.
@@@ -58,3 -58,6 +58,6 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/NodeManager/
  
  %changelog
+ * Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-38
+ - split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib
+