From 5d55bc70b52b447cc881c067cd728f40173d9688 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 4 Nov 2022 09:36:36 +0100
Subject: [PATCH] move back to master branch for SMESH since TopIIVol plugin
 developments are OK

---
 applications/SALOME-master-native.pyconf  | 3 +--
 applications/SALOME-master-windows.pyconf | 2 +-
 applications/SALOME-master.pyconf         | 7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ee3ec37..fb90642 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -148,7 +148,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -235,7 +235,6 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.SMESH' :  'master'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                  }
diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 077dcde..eaba411 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -143,7 +143,7 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 7096b38..e1e5d3d 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -150,7 +150,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -228,13 +228,8 @@ __overwrite__ :
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
-    {
-        __condition__ : "VARS.dist in ['DB09']"
-        'APPLICATION.products.SMESH' :  'master'
-    }
     {
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.SMESH' :  'master'
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
-- 
2.39.2