[tg_owt/f36] Introduced build conditionals to match telegram-desktop package.
by Vitaly Zaitsev
commit e0821fb1b34d60c256a9a0732a5f1d1e78378f0a
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Dec 31 11:17:10 2022 +0100
Introduced build conditionals to match telegram-desktop package.
tg_owt.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index f575ac4..df46b3e 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -1,4 +1,6 @@
%global debug_package %{nil}
+%global legacy_ffmpeg 1
+%global legacy_openssl 1
%global commit0 1eab2d736a2fecce01686689b72e39ad8c314ebb
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
@@ -71,7 +73,7 @@ BuildRequires: yasm
# Upstream refuses to fix this issue:
# https://github.com/telegramdesktop/tdesktop/issues/24855
# https://github.com/telegramdesktop/tdesktop/issues/23899
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_ffmpeg}
BuildRequires: compat-ffmpeg4-devel
%else
BuildRequires: pkgconfig(libavcodec)
@@ -83,7 +85,7 @@ BuildRequires: pkgconfig(libswscale)
# Video calls doesn't work when built against openssl 3.0:
# https://github.com/telegramdesktop/tdesktop/issues/24698
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_openssl}
BuildRequires: openssl1.1-devel
%else
BuildRequires: pkgconfig(openssl)
@@ -131,7 +133,7 @@ Requires: pkgconfig(xrandr)
Requires: pkgconfig(xrender)
Requires: pkgconfig(xtst)
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_ffmpeg}
Requires: compat-ffmpeg4-devel
%else
Requires: pkgconfig(libavcodec)
@@ -141,7 +143,7 @@ Requires: pkgconfig(libswresample)
Requires: pkgconfig(libswscale)
%endif
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_openssl}
Requires: openssl1.1-devel
%else
Requires: pkgconfig(openssl)
1 year, 3 months
[telegram-desktop/f36] Introduced new build conditionals.
by Vitaly Zaitsev
commit d03c20d33ab37981ec21b8457e82ffa2fbc2ea14
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Dec 31 11:07:24 2022 +0100
Introduced new build conditionals.
telegram-desktop.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index b529aee..7f9b7fa 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,6 +2,8 @@
%global bundled_fonts 1
%global enable_wayland 1
%global enable_x11 1
+%global legacy_ffmpeg 1
+%global legacy_openssl 1
# Telegram Desktop's constants...
%global appname tdesktop
@@ -113,7 +115,7 @@ Requires: webkit2gtk3%{?_isa}
# Upstream refuses to fix this issue:
# https://github.com/telegramdesktop/tdesktop/issues/24855
# https://github.com/telegramdesktop/tdesktop/issues/23899
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_ffmpeg}
BuildRequires: compat-ffmpeg4-devel
Requires: compat-ffmpeg4%{?_isa}
%else
@@ -127,7 +129,7 @@ Requires: ffmpeg-libs%{?_isa}
# Video calls doesn't work when built against openssl 3.0:
# https://github.com/telegramdesktop/tdesktop/issues/24698
-%if 0%{?fedora} && 0%{?fedora} >= 36
+%if %{legacy_openssl}
BuildRequires: openssl1.1-devel
Requires: openssl1.1%{?_isa}
%else
1 year, 3 months
[telegram-desktop/f36] Adjusted virtual version of bundled kf5-kcoreaddons.
by Vitaly Zaitsev
commit 4425100e8056d5185f4218b5b028d2f5e8328d43
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Dec 31 10:57:43 2022 +0100
Adjusted virtual version of bundled kf5-kcoreaddons.
telegram-desktop.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 1ed88ad..b529aee 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -89,7 +89,7 @@ BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: qt6-qtbase-static
-Provides: bundled(kf5-kcoreaddons) = 5.98.0
+Provides: bundled(kf5-kcoreaddons) = 5.101.0
Provides: bundled(plasma-wayland-protocols) = 1.6.0
%endif
1 year, 3 months