From: SALOME support <support-salome@cea.fr>
Date: Thu, 22 Jul 2021 12:17:08 +0000 (+0200)
Subject: spns #24300 overwrite qt native rpm package
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3164885e99665647effbd69eabaf0653faf47b72;p=tools%2Fsat_salome.git

spns #24300 overwrite qt native rpm package
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 8a316b7..7f683bc 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -226,4 +226,11 @@ __overwrite__ :
       'PRODUCTS.sphinxintl.default.properties.pip' : "no"
       'APPLICATION.products.cmake' : '3.12.1'
    }
+   {
+      # FD 34 qt5 package is qt5-qtbase-devel.
+      
+      __condition__ : "VARS.dist in ['FD34']"
+      'PRODUCTS.qt.default.system_info.rpm' : []
+      'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"]
+   }
 ]
diff --git a/products/qt.pyconf b/products/qt.pyconf
index c0fe669..2d9eb44 100644
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -7,7 +7,7 @@ default:
     system_info : 
     {
         rpm : []
-        rpm_dev : ["qt5-qtbase-devel"]
+        rpm_dev : ["qt5-devel"]
         apt : []
         apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
     }