From fe50a644c6f76d0ab6e08017f1965d25346164f9 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Fri, 30 Mar 2012 12:20:44 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: Sphinx 1.0.7 -> 1.1.3

---
 config_CentOS_5.5_64bit.xml                 |  4 ++--
 config_Debian_4.0.xml                       |  4 ++--
 config_Debian_4.0_64bit.xml                 |  4 ++--
 config_Debian_5.0_64bit.xml                 |  4 ++--
 config_Debian_6.0_64bit.xml                 |  4 ++--
 config_Mandriva_2008.0.xml                  |  4 ++--
 config_Mandriva_2008.0_64bit.xml            |  4 ++--
 config_Mandriva_2010.0.xml                  |  4 ++--
 config_Mandriva_2010.0_64bit.xml            |  4 ++--
 config_Red_Hat_Enterprise_WS_4_64bit.xml    |  4 ++--
 config_Scientific_SL_5.1_64bit.xml          |  4 ++--
 config_files/{sphinx-1.0.7.sh => Sphinx.sh} | 23 ++++++++++++---------
 12 files changed, 35 insertions(+), 32 deletions(-)
 rename config_files/{sphinx-1.0.7.sh => Sphinx.sh} (82%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 9c06fc5..3c0ae98 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="CentOS 5.5 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 9d5b433..4fb8250 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Debian 4.0"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 2d5c08b..5eda911 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Debian 4.0 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 72ca1d4..42a5bee 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Debian 5.0 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 45334ca..1afe786 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Debian 6.0 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 827aa22..de664e2 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Mandriva 2008.0"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 1a18cff..c6726e8 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Mandriva 2008.0 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 4540afb..aabbb47 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Mandriva 2010.0"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index a19c5c5..1d17085 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Mandriva 2010.0 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 3724119..7401ce4 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 321014e..22c7f74 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -630,10 +630,10 @@
 	     type="prerequisite"
              description="Tool for creation of documentation for Python projects">
       <installation os="Scientific SL 5.1 64bit"
-                    version="1.0.7" 
+                    version="1.1.3" 
 		    disable="false"
 		    installdiskspace="2163,3342,6310"
-		    script="sphinx-1.0.7.sh"/>
+		    script="Sphinx.sh"/>
     </product>
     <product name="netgen" 
 	     type="prerequisite"
diff --git a/config_files/sphinx-1.0.7.sh b/config_files/Sphinx.sh
similarity index 82%
rename from config_files/sphinx-1.0.7.sh
rename to config_files/Sphinx.sh
index 7938a60..ecb16a5 100755
--- a/config_files/sphinx-1.0.7.sh
+++ b/config_files/Sphinx.sh
@@ -15,7 +15,10 @@
 #
 # Sphinx version
 #
-SPHINX_VERSION=1.0.7
+SPHINX_VERSION=1.1.3
+SETUPTOOLS_VERSION=0.6c11
+JINJA2_VERSION=2.6
+PYGMENTS_VERSION=1.5
 
 check_version(){
 # It is not necessary to check version!
@@ -57,10 +60,10 @@ source ${INSTALL_WORK}/$SHRC
 
 makedir ${PRODUCT_SRC_DIR}
 # unpack
-check_jb tar xfz ${SOURCE_DIR}/sphinx-${SPHINX_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/setuptools-0.6c11.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/jinja2-2.5.5.tar.gz -C ${PRODUCT_SRC_DIR}
-check_jb tar xfz ${SOURCE_DIR}/pygments-1.4.0.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/Sphinx-${SPHINX_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/setuptools-${SETUPTOOLS_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/Jinja2-${JINJA2_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
+check_jb tar xfz ${SOURCE_DIR}/Pygments-${PYGMENTS_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -89,10 +92,10 @@ GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
-cd ${PRODUCT_SRC_DIR}/setuptools-0.6c11_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/pygments-1.4.0_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/jinja2-2.5.5_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}/sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/setuptools-${SETUPTOOLS_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/Pygments-${PYGMENTS_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/Jinja2-${JINJA2_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}/Sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin; 
 
@@ -155,7 +158,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="sphinx-${SPHINX_VERSION}"
+export PRODUCT="Sphinx-${SPHINX_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-- 
2.39.2