diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec index 125b108cbf594983d8ceddbdd175d0c8bd21383e..ae75510091057f54049fc2d6c90c1eaa14818f1f 100644 --- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec +++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec @@ -16,6 +16,9 @@ %define computed_job_count_ %(echo $(( %available_memory / %memory_required_per_core / %max_parallel_builds ))) %define computed_job_count %max %computed_job_count_ 1 %define job_count %min %cpu_count %computed_job_count +# Exclude vendored Qt6 from dependency generator +%define __provides_exclude_from ^%{_libdir}/qt-jami/.*$ +%define __requires_exclude ^libQt6.*$ Name: %{name} Version: %{version} diff --git a/extras/packaging/gnu-linux/rules/rpm/jami.spec b/extras/packaging/gnu-linux/rules/rpm/jami.spec index bce9246492b4fea6c76e4496e1cd26ca97e3a1ea..f0e8219ceb8b445ca7e5a5568dc2a839b3c70893 100644 --- a/extras/packaging/gnu-linux/rules/rpm/jami.spec +++ b/extras/packaging/gnu-linux/rules/rpm/jami.spec @@ -2,6 +2,9 @@ %define version RELEASE_VERSION %define release 0 +# Exclude vendored Qt6 from dependency generator +%define __requires_exclude ^libQt6.*$ + Name: %{name} Version: %{version} Release: %{release}%{?dist} diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh index 61c88819e7900037b6bbdf90b0e91a43158155cc..921ac3088ab8b39b79632b0404fd001bd514381d 100755 --- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh +++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh @@ -44,7 +44,7 @@ CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}" QT_MAJOR=6 QT_MINOR=6 QT_PATCH=1 -QT_RELEASE_PATCH=0 +QT_RELEASE_PATCH=1 QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR} QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}