Merge branch '4.3' of ssh://git.planet-lab.org/git/myplc into 4.3

diff --git a/myplc-docs.spec b/myplc-docs.spec
index dd71f7b..6d4a6d0 100644 (file)
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-docs
 %define version 4.3
-%define taglevel 41
+%define taglevel 42
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %changelog
+* Thu Jan 06 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - myplc-4.3-42
+- handle directory name changes
+
 * Thu Nov 18 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - myplc-4.3-41
 - Use correct resolv.conf file.
 

diff --git a/myplc-release.spec b/myplc-release.spec
index d7aa7c5..81399b3 100644 (file)
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-release
 %define version 4.3
-%define taglevel 41
+%define taglevel 42
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/myplc-release
 
 %changelog
+* Thu Jan 06 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - myplc-4.3-42
+- handle directory name changes
+
 * Thu Nov 18 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - myplc-4.3-41
 - Use correct resolv.conf file.
 

diff --git a/myplc.spec b/myplc.spec
index da5c9d4..97a1ffa 100644 (file)
--- a/myplc.spec
+++ b/myplc.spec
@@ -5,7 +5,7 @@
 
 %define name myplc
 %define version 4.3
-%define taglevel 41
+%define taglevel 42
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -221,6 +221,9 @@ fi
 
 
 %changelog
+* Thu Jan 06 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - myplc-4.3-42
+- handle directory name changes
+
 * Thu Nov 18 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - myplc-4.3-41
 - Use correct resolv.conf file.