From 27644c3def4135183cfad9f735558deeacac6e37cedd11ab493db373a5a47d3d Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Fri, 18 Aug 2023 12:46:13 +0000 Subject: [PATCH] Accepting request 1104648 from home:manfred-h:server:messaging - Rectify build requirements for the upcoming openSUSE Leap 15.6 OBS-URL: https://build.opensuse.org/request/show/1104648 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=264 --- telegram-desktop.changes | 5 +++++ telegram-desktop.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 867492a..9673fd2 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 15 14:08:09 UTC 2023 - Manfred Hollstein + +- Rectify build requirements for the upcoming openSUSE Leap 15.6 + ------------------------------------------------------------------- Thu Jul 20 08:07:41 UTC 2023 - Guillaume GARDET diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 591bd49..67cb26f 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -24,7 +24,7 @@ %define __builder ninja # gcc10 or higher is required -%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150500 ) ) +%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150600 ) ) %bcond_without compiler_upgrade %else %if 0%{?suse_version} > 01500 @@ -132,6 +132,7 @@ BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libqt5-qtwayland-private-headers-devel BuildRequires: pkgconfig(dbusmenu-qt%{qt_major_version}) %endif +BuildRequires: libopenssl-1_1-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fmt) @@ -169,7 +170,6 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(mtdev) BuildRequires: pkgconfig(openal) -BuildRequires: libopenssl-1_1-devel BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(opusfile) BuildRequires: pkgconfig(opusurl) @@ -297,7 +297,7 @@ cd %{_builddir}/tdesktop-%{version}-full -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \ -DDESKTOP_APP_USE_ENCHANT=ON \ %endif -%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150500 ) ) +%if 0%{?suse_version} && ( 0%{?suse_version} < 1500 || ( 0%{?is_opensuse} && 0%{?suse_version} == 1500 && 0%{?sle_version} && 0%{?sle_version} <= 150600 ) ) -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ %endif -DTDESKTOP_API_ID=611335 \