commit 1de3e45a230877fb7358afcf285cec6aa4e747ec Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Thu Nov 12 17:16:02 2020 +0100 Rebuilt with bundled version of libtgvoip. telegram-desktop.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) --- diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 5dc098b..8aa87a7 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -5,6 +5,7 @@ %bcond_with rlottie %bcond_with gtk3 %bcond_with clang +%bcond_with libtgvoip # Telegram Desktop's constants... %global appname tdesktop @@ -28,7 +29,7 @@ Name: telegram-desktop Version: 2.4.7 -Release: 1%{?dist} +Release: 2%{?dist} # Application and 3rd-party modules licensing: # * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball; @@ -61,6 +62,12 @@ BuildRequires: rlottie-devel Provides: bundled(rlottie) = 0~git %endif +%if %{with libtgvoip} +BuildRequires: libtgvoip-devel >= 2.4.4 +%else +Provides: bundled(libtgvoip) = 2.4.4 +%endif + # Compilers and tools... BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -71,7 +78,6 @@ BuildRequires: gcc # Development packages for Telegram Desktop... BuildRequires: guidelines-support-library-devel >= 3.0.1 BuildRequires: qt5-qtbase-private-devel -BuildRequires: libtgvoip-devel >= 2.4.4 BuildRequires: range-v3-devel >= 0.10.0 BuildRequires: libqrcodegencpp-devel BuildRequires: minizip-compat-devel @@ -126,13 +132,18 @@ business messaging needs. %autosetup -n %{appname}-%{version}-full -p1 # Unbundling libraries... -rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,libtgvoip,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash} +rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash} # Unbundling rlottie if build against packaged version... %if %{with rlottie} rm -rf Telegram/ThirdParty/rlottie %endif +# Unbundling libtgvoip if build against packaged version... +%if %{with libtgvoip} +rm -rf Telegram/ThirdParty/libtgvoip +%endif + %build # Building Telegram Desktop using cmake... %cmake -G Ninja \ @@ -184,11 +195,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop %{_metainfodir}/%{launcher}.appdata.xml %changelog +* Thu Nov 12 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.7-2 +- Rebuilt with bundled version of libtgvoip. + * Thu Nov 05 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.7-1 - Updated to version 2.4.7. * Mon Nov 02 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.6-1 - Updated to version 2.4.6. - -* Sun Nov 01 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 2.4.5-1 -- Updated to version 2.4.5.