[Erp5-report] r36245 kazuhiko - /erp5/trunk/buildout/helpers/mandriva2010.0.sh

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jun 10 19:16:05 2010
New Revision: 36245

URL: http://svn.erp5.org?rev=36245&view=rev
Log:
'libungif-devel' is provided fine by both 32-bit and 64-bit packages.

Modified:
    erp5/trunk/buildout/helpers/mandriva2010.0.sh

Modified: erp5/trunk/buildout/helpers/mandriva2010.0.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/mandriva2010.0.sh?rev=36245&r1=36244&r2=36245&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] Thu Jun 10 19:16:05 2010
@@ -12,16 +12,7 @@ Helper for buildout-base installation of
    -h  shows this message
    -l  lists the required dependencies\
 """
-# Avoid some mandriva bugs, when package with canonical name libXXX
-# is wrongly only 32 bit
-if [ `uname -m` == "x86_64" ] ; then # XXX: Is it compilant way to fetch arch?
-  libs="lib64ungif4-devel"
-else
-  libs="libungif4-devel"
-fi
-
 PACKAGE_LIST="""\
-${libs}
 automake
 bison
 cpio
@@ -33,7 +24,7 @@ libboost-devel
 libbzip2-devel
 libboost-devel
 libgdbm-devel
-libglib2.0-devel
+libglib2-devel
 libSDL-devel
 libSDL_gfx-devel
 libSDL_image-devel
@@ -47,6 +38,7 @@ libpng-devel
 libreadline-devel
 libsasl2-devel
 libtermcap-devel
+libungif-devel
 libxml2-devel
 libxslt-devel
 make