From 92341b27b6b7899b80f805e89ac1ebf6f088a051 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Sun, 7 Apr 2024 18:14:06 +0200
Subject: [PATCH] rpm: Exclude vendored libraries from the list of provides
The RPM automatic dependency generator adds provides for all
libraries under %{_libdir}. When vendoring libraries you must disable
this behaviour, otherwise other packages that link against Qt will
not pull in the distro qt packages if jami-libqt is already installed
Change-Id: I3f0a018ea12be7f29d04ca4441cbfdebc2efb909
---
extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec | 3 +++
extras/packaging/gnu-linux/rules/rpm/jami.spec | 3 +++
extras/packaging/gnu-linux/scripts/build-package-rpm.sh | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
index 125b108cb..ae7551009 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 bce924649..f0e8219ce 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 61c88819e..921ac3088 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}
--
GitLab