From 83d916ee7065706879751887fbdab26f0bc44de3 Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Sun, 8 Apr 2012 08:44:01 +0000
Subject: [PATCH] use simplifications of lamp template for phpfin

---
 software/phpfin/software.cfg | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/software/phpfin/software.cfg b/software/phpfin/software.cfg
index 5339ce7d1..0514e7588 100644
--- a/software/phpfin/software.cfg
+++ b/software/phpfin/software.cfg
@@ -7,23 +7,15 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
   configure-script
 
 extends =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
+  ../../stack/lamp.cfg
 
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://garr.dl.sourceforge.net/project/phpfin/phpfin/phpfinV1.00%20Free/phpfinfree1_0.zip
-md5sum = 06f5ef5205c492e38ecbb6159f5417e4
-script = 
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir , "${buildout:parts-directory}/${:_buildout_section_name_}")
-  
+md5sum = 06f5ef5205c492e38ecbb6159f5417e4  
 
 [configure-script]
 recipe = hexagonit.recipe.download
@@ -34,7 +26,7 @@ download-only = True
 
 [application-template]
 recipe = slapos.recipe.download
-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp-mayoro:/software/phpfin/template/connect.inc.in
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp-mayoro:/software/phpfin/template/connection.inc.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 download-only = True
 filename = template.in
@@ -42,7 +34,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
-location = connect.inc
+location = connection.inc
 
 
 [instance-recipe]
@@ -62,20 +54,4 @@ recipe = zc.recipe.egg
 eggs =
     ${mysql-python:egg}
     ${instance-recipe:egg}
-    slapos.toolbox[lampconfigure]
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
+    slapos.toolbox[lampconfigure]
\ No newline at end of file
-- 
2.30.9