mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-03-28 14:56:19 +01:00
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
This commit is contained in:
parent
f39afdac4c
commit
92341b27b6
3 changed files with 7 additions and 1 deletions
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Add table
Reference in a new issue