PERSALYS on FD32 prerequisistes update

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index b056cf54d5700c5f3b15597775f21fa3c8e70f13..5c8715493cb4555530ffeaea0a5bb22163ec1464 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -242,7 +242,7 @@ __overwrite__ :
         'APPLICATION.products.opencv'    : '3.2.0'
         'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'              }
         'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32'               }
-
+        'APPLICATION.products.Sphinx'    : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip'            }
     }
     {
         # FD 34 qt5 package is qt5-qtbase-devel.

diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf
index a3ce9dbbe581358ce0ed7a4358c846de2d20ee74..de2af97d8f93737ad2e86694b9c1a9df73536ea8 100644 (file)
--- a/products/Sphinx.pyconf
+++ b/products/Sphinx.pyconf
@@ -44,6 +44,15 @@ version_2_1_2:
 
 }
 
+version_1_7_6_no_pip:
+{
+    properties:
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}
+
 version_1_1_3_to_1_2_3 :
 {
     name : "Sphinx"

diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index 988707e0f8f3653bb132ff2447aa2e1df52fb161..1903b9fc3a184a58c9c9399e46d8cc4a5c578916 100644 (file)
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -36,7 +36,7 @@ default :
         "CO7" :
         {
             rpm : ["lz4", "gsl", "libgeotiff", "giflib", "geos"]
-            rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel" ]
+            rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel"]
         }
         "CO8" :
         {
@@ -51,7 +51,7 @@ default :
         "FD32" :
         {
            rpm : ["lz4", "gsl", "openmpi", "netcdf", "gdal"]
-           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel"]
+           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "protobuf-devel", "python3-protobuf"]
         }
         "FD34" :
         {