From ead13d0735e1371abd32505425ea3d4e29a63f7a Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2012 19:27:30 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: update script for PyQt (4.7.3)

---
 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/{PyQt-4.7.3.sh => PyQt.sh}  | 12 +++++++-----
 12 files changed, 18 insertions(+), 16 deletions(-)
 rename config_files/{PyQt-4.7.3.sh => PyQt.sh} (93%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index abd0923..db96f67 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 5faafd5..ddc4514 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index fd6c374..c669208 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 080a87e..bde8a9b 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index f2f6ddb..51a7fce 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 8eff647..2567021 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 6095842..8a055e4 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 668f70c..cf14dbc 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index a910d27..3e973d6 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 8e05782..a5646e7 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index c2ec24d..9716394 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -408,7 +408,7 @@
                     version="4.7.3" 
 		    disable="false"
 		    installdiskspace="14884,28844,120520"
-		    script="PyQt-4.7.3.sh"/>
+		    script="PyQt.sh"/>
     </product>
     <product name="QScintilla" 
 	     type="prerequisite"
diff --git a/config_files/PyQt-4.7.3.sh b/config_files/PyQt.sh
similarity index 93%
rename from config_files/PyQt-4.7.3.sh
rename to config_files/PyQt.sh
index 4fd62e8..e3e70fd 100755
--- a/config_files/PyQt-4.7.3.sh
+++ b/config_files/PyQt.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : PyQt-4.7.3.sh
+#  File      : PyQt.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.
 #
@@ -75,7 +75,10 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # apply patch for phonon package
-( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
+apply_patch_for_phonon=1
+if [ "$apply_patch_for_phonon" == "1" ] ; then
+    ( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
+fi
 
 # to generate environment scripts
 try_preinstalled
@@ -146,8 +149,7 @@ if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
 	pyqtconfig.py > pyqtconfig.py.1
     mv -f pyqtconfig.py.1 pyqtconfig.py
     cd ${PRODUCT_DIR}/bin
-    sed -e "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4 > pyuic4.1
-    mv -f pyuic4.1 pyuic4 && chmod a+x pyuic4
+    sed -i "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4
 fi
 
 # to generate environment script for sources
-- 
2.39.2