update fengoffice version, simplify software configuration and instance

software/fengoffice/instance.cfg

@@ -7,7 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

software/fengoffice/software.cfg

@@ -7,21 +7,14 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
   
 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
-url = http://ignum.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.0.0beta2/fengoffice_2.0.0beta2.zip
-md5sum = a8125c8a945531f6e9bcd8fae4a8f509
-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_}")
+recipe = slapos.recipe.build:download-unpacked
+url = http://freefr.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.0.0/fengoffice_2.0.0.zip
+md5sum = 2f673962ac377da7942ba8a09429ddbf
   
 [instance-recipe]
 egg = slapos.cookbook
@@ -39,23 +32,4 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 eggs = 
-    ${mysql-python:egg}
     ${instance-recipe:egg}
\ No newline at end of file
-    slapos.toolbox[lampconfigure]
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.32
-
-[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