From 87088573bc58dcd304948e48fb5f64bf6f7eec7f Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 10 Jun 2010 17:16:05 +0000
Subject: [PATCH] 'libungif-devel' is provided fine by both 32-bit and 64-bit
 packages.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36245 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/helpers/mandriva2010.0.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/buildout/helpers/mandriva2010.0.sh b/buildout/helpers/mandriva2010.0.sh
index bba0491e1e..6a9b20a7b5 100755
--- a/buildout/helpers/mandriva2010.0.sh
+++ b/buildout/helpers/mandriva2010.0.sh
@@ -12,16 +12,7 @@ Helper for buildout-base installation of ERP5 on Mandriva 2010.
    -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
-- 
2.30.9