From e44b059c7ee93d436e6f23f50bfc8b1dd6951d23 Mon Sep 17 00:00:00 2001 From: SALOME support Date: Thu, 22 Jul 2021 14:17:08 +0200 Subject: [PATCH] spns #24300 overwrite qt native rpm package --- applications/SALOME-master-native.pyconf | 7 +++++++ products/qt.pyconf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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"] } -- 2.39.2