Commit b7cccaae authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-cluster

parents 2add6e19 c9694c5b
...@@ -11,9 +11,9 @@ extends = ...@@ -11,9 +11,9 @@ extends =
[groonga] [groonga]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
version = 3.1.1 version = 3.1.2
url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
md5sum = c8bae890be05b4226f095839a049823e md5sum = fdd39d0c5bd647fb1a42e65f9d389081
configure-options = configure-options =
--disable-static --disable-static
--disable-glibtest --disable-glibtest
......
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../fontconfig/buildout.cfg ../fontconfig/buildout.cfg
../freetype/buildout.cfg ../freetype/buildout.cfg
../glibmm/buildout.cfg
../gtk-2/buildout.cfg ../gtk-2/buildout.cfg
../libpng/buildout.cfg ../libpng/buildout.cfg
../libxml2/buildout.cfg ../libxml2/buildout.cfg
......
...@@ -63,8 +63,8 @@ environment = ...@@ -63,8 +63,8 @@ environment =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users. # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/ # http://mroonga.github.com/
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-3.11.tar.gz url = http://packages.groonga.org/source/mroonga/mroonga-3.12.tar.gz
md5sum = 3adfc67972b219586d0fdef9da25bc55 md5sum = 45d98789035dd9f00ad7cdc74098e190
configure-options = configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version} --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config --with-mysql-config=${mariadb:location}/bin/mysql_config
......
...@@ -10,12 +10,13 @@ extends = ...@@ -10,12 +10,13 @@ extends =
../libtiff/buildout.cfg ../libtiff/buildout.cfg
../libxml2/buildout.cfg ../libxml2/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
[poppler] [poppler]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://poppler.freedesktop.org/poppler-0.22.5.tar.gz url = http://poppler.freedesktop.org/poppler-0.24.5.tar.xz
md5sum = 1cd27460f7e3379d1eb109cfd7bcdb39 md5sum = 334f2ac95cc8039f2a57fe63e4a81c69
depends = depends =
${libtiff:version} ${libtiff:version}
${libpng:so_version} ${libpng:so_version}
...@@ -28,10 +29,11 @@ configure-options = ...@@ -28,10 +29,11 @@ configure-options =
--disable-poppler-cpp --disable-poppler-cpp
--disable-poppler-glib --disable-poppler-glib
--disable-poppler-qt4 --disable-poppler-qt4
--disable-poppler-qt5
--disable-static --disable-static
--enable-zlib --enable-zlib
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libpng:location}/lib/pkgconfig PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libpng:location}/lib/pkgconfig
CPPFLAGS=-I${bzip2:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
...@@ -606,10 +606,13 @@ PasteDeploy = 1.5.2 ...@@ -606,10 +606,13 @@ PasteDeploy = 1.5.2
Pygments = 1.6 Pygments = 1.6
argparse = 1.2.1 argparse = 1.2.1
coverage = 3.7.1 coverage = 3.7.1
lxml = 3.2.5 lxml = 3.3.0
mr.developer = 1.27 mr.developer = 1.27
setuptools = 2.1 setuptools = 2.1
# huBarcode 1.0.0 has an issue with importing PIL.
huBarcode = 0.63
# Known version with works # Known version with works
numpy = 1.6.2 numpy = 1.6.2
...@@ -632,6 +635,9 @@ rdiff-backup = 1.0.5 ...@@ -632,6 +635,9 @@ rdiff-backup = 1.0.5
# use newest version of slapos.cookbook # use newest version of slapos.cookbook
slapos.cookbook = slapos.cookbook =
# we need to define an explicit version of slapos.core that is propagated to instances
slapos.core = 1.0.2.1
# modified version that works fine for buildout installation # modified version that works fine for buildout installation
SOAPpy = 0.12.0nxd001 SOAPpy = 0.12.0nxd001
...@@ -666,15 +672,16 @@ Products.MimetypesRegistry = 2.0.5 ...@@ -666,15 +672,16 @@ Products.MimetypesRegistry = 2.0.5
Products.PluginRegistry = 1.3 Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9 Products.TIDStorage = 5.4.9
Products.ZSQLMethods = 2.13.4 Products.ZSQLMethods = 2.13.4
PyPDF2 = 1.19 PyPDF2 = 1.20
StructuredText = 2.11.1 StructuredText = 2.11.1
WSGIUtils = 0.7 WSGIUtils = 0.7
Werkzeug = 0.9.4 Werkzeug = 0.9.4
apache-libcloud = 0.13.3 apache-libcloud = 0.14.0
async = 0.6.1 async = 0.6.1
atomize = 0.1.1 atomize = 0.1.1
cElementTree = 1.0.5-20051216 cElementTree = 1.0.5-20051216
chardet = 2.2.1 chardet = 2.2.1
cliff = 1.5.2
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
elementtree = 1.2.7-20070827-preview elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3 erp5.recipe.cmmiforcei686 = 0.1.3
...@@ -689,7 +696,6 @@ gitdb = 0.5.4 ...@@ -689,7 +696,6 @@ gitdb = 0.5.4
greenlet = 0.4.2 greenlet = 0.4.2
hexagonit.recipe.cmmi = 2.0 hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3 http-parser = 0.8.3
huBarcode = 0.63
inotifyx = 0.2.0 inotifyx = 0.2.0
ipdb = 0.8 ipdb = 0.8
ipython = 1.1.0 ipython = 1.1.0
...@@ -706,16 +712,16 @@ pyflakes = 0.7.3 ...@@ -706,16 +712,16 @@ pyflakes = 0.7.3
python-ldap = 2.4.13 python-ldap = 2.4.13
python-magic = 0.4.6 python-magic = 0.4.6
qrcode = 4.0.4 qrcode = 4.0.4
requests = 2.2.0 requests = 2.2.1
restkit = 4.2.2 restkit = 4.2.2
rtjp-eventlet = 0.3.2 rtjp-eventlet = 0.3.2
slapos.core = 1.0.2.1
slapos.recipe.build = 0.12 slapos.recipe.build = 0.12
slapos.recipe.template = 2.5 slapos.recipe.template = 2.5
slapos.toolbox = 0.38.1 slapos.toolbox = 0.38.1
smmap = 0.8.2 smmap = 0.8.2
socketpool = 0.5.3 socketpool = 0.5.3
spyne = 2.10.9 spyne = 2.10.9
stevedore = 0.14.1
supervisor = 3.0 supervisor = 3.0
threadframe = 0.2 threadframe = 0.2
timerserver = 2.0.2 timerserver = 2.0.2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment