From 77b0941c6a23d3d3a7645703351eec552887366a Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Tue, 3 Apr 2012 16:35:26 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for expat (2.0.1)

---
 config_CentOS_5.5_64bit.xml               |  2 +-
 config_Debian_4.0.xml                     |  2 +-
 config_Debian_4.0_64bit.xml               |  2 +-
 config_Debian_5.0_64bit.xml               |  2 +-
 config_Debian_6.0_64bit.xml               |  2 +-
 config_Mandriva_2008.0.xml                |  2 +-
 config_Mandriva_2008.0_64bit.xml          |  2 +-
 config_Mandriva_2010.0.xml                |  2 +-
 config_Mandriva_2010.0_64bit.xml          |  2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml  |  2 +-
 config_Scientific_SL_5.1_64bit.xml        |  2 +-
 config_files/{expat-2.0.1.sh => expat.sh} | 25 +++++++++++++++--------
 12 files changed, 27 insertions(+), 20 deletions(-)
 rename config_files/{expat-2.0.1.sh => expat.sh} (80%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 8f73384..4ecc4fc 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 3469135..e7e964a 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 9b66199..84e99c4 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 3a32254..33b39ab 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 9c061d4..d4cf98b 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index de0bfc3..b5ccc81 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 77f76be..1a752ba 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 541b274..9fd953b 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index cc4ea4e..942364c 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 78ce7b5..485c03a 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 117ee38..bc62a52 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_files/expat-2.0.1.sh b/config_files/expat.sh
similarity index 80%
rename from config_files/expat-2.0.1.sh
rename to config_files/expat.sh
index 49a4019..d9c81d2 100755
--- a/config_files/expat-2.0.1.sh
+++ b/config_files/expat.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : expat-2.0.1.sh
+#  File      : expat.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -18,8 +18,16 @@
 EXPAT_VERSION=2.0.1
 
 check_version(){
-# It is not necessary to check version!
-return 0
+if [ "$EXPAT_ROOT" != "" ] && [ -f ${EXPAT_ROOT}/include/expat.h ] ; then
+    ver_major=`grep "#define XML_MAJOR_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
+    ver_minor=`grep "#define XML_MINOR_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
+    ver_maint=`grep "#define XML_MICRO_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
+    ver="$ver_major.$ver_minor.$ver_maint"
+    if [ "$ver" == "${EXPAT_VERSION}" ] ; then
+        return 0
+    fi
+fi
+return 1
 }
 
 print_env_bin(){
@@ -73,8 +81,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 # install
 cd ${PRODUCT_SRC_DIR}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-./configure --prefix=${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -105,9 +112,9 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # modify libdir
 cd ${PRODUCT_DIR}/lib
-for l in `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+for l in XXX `find $ldir -name "*.la"`; do
+    if [ "$l" == "XXX" ] ; then continue; fi
+    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l
 done
 
 # to generate environment script for sources
-- 
2.39.2