From 2506b328935828a9b9176918ceb232eda5e1b2f3 Mon Sep 17 00:00:00 2001
From: Jondy Zhao <jondy.zhao@gmail.com>
Date: Fri, 12 Jul 2013 14:25:11 +0800
Subject: [PATCH] Fix alias url in the client configure template file

---
 windows/docs/using-slapos-in-windows.xml | 10 ++++++++--
 windows/scripts/slapos-include.sh        |  8 ++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/windows/docs/using-slapos-in-windows.xml b/windows/docs/using-slapos-in-windows.xml
index ff8ec71..ce78a15 100755
--- a/windows/docs/using-slapos-in-windows.xml
+++ b/windows/docs/using-slapos-in-windows.xml
@@ -418,12 +418,18 @@ In the slapos.package.git, add branch 'cygwin', it includes most of sources for
 <para>Update sources in the slapos.core.git, then push it</para>
 <para>Update sources in the re6stnet.git, then push it</para>
 <para>Update sources in the slapos.package.git, then push it.</para>
-<para>If you change any egg, for examples, netifaces, inotifyx, psutil, you need:
+<para>Update egg psutil, for example, upgrade from 0.6.1 to 1.0.0, 
 <programlisting>
+wget http://psutil.googlecode.com/files/psutil-1.0.0.tar.gz
+tar xzf psutil-1.0.0.tar.gz
+cd psutil-1.0.0
+patch -p1 &lt; /opt/git/slapos.package/windows/patches/psutil-0.6.2.patch
+# change the version to 1.0.1 in the psutil/__init__.py 
 python setup.py sdist
 </programlisting>
-Then upload the source packages to http://www.nexedi.org/static/packages/source/slapos.buildout/
+Then upload the source packages dist/psutil-1.0.1.tar.gz to http://www.nexedi.org/static/packages/source/slapos.buildout/
 </para>
+<para>Update egg netifaces, same as psutil, except use patch file netifaces-0.8-1-cygwin.patch</para>
 </section>
 
 <section><title>How to upgrade installer</title>
diff --git a/windows/scripts/slapos-include.sh b/windows/scripts/slapos-include.sh
index 61b7c61..c2ffe18 100755
--- a/windows/scripts/slapos-include.sh
+++ b/windows/scripts/slapos-include.sh
@@ -382,14 +382,10 @@ function create_template_configure_file()
     wget http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example -O $client_template_file || return 1
     sed -i -e "/^alias/,\$d" $client_template_file
     echo "alias =
-  apache_frontend http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/erp5/software.cfg
-  erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
+  apache_frontend http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/apache-frontend/software.cfg
+  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.143:/software/erp5/software.cfg
   mariadb http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/mariadb/software.cfg
-  memcached http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/memcached/software.cfg
   mysql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/mysql-5.1/software.cfg
-  postgresql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/postgres/software.cfg
-  slaposwebrunner http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slaprunner/software.cfg
   slaposwebrunner_lite http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slaprunner-lite/software.cfg
   wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/wordpress/software.cfg
   netdrive_reporter http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/netdrive-reporter/software.cfg" \
-- 
2.30.9