From 2b3d6dbe7bcd99727a4375b28fd7e6f0e4cb9cb8 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 20 Dec 2023 09:41:01 +0100 Subject: [PATCH] [ci,nightly] fix fedora dependencies allow ffmpeg-devel or ffmpeg-free-devel --- packaging/rpm/freerdp-nightly.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index a7a3f0e61..c7fefbc84 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -25,8 +25,8 @@ Url: http://www.freerdp.com Group: Productivity/Networking/Other Source0: %{name}-%{version}.tar.bz2 Source1: source_version -BuildRequires: gcc-c++ -BuildRequires: cmake >= 3.13.0 +BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.13.0 BuildRequires: libxkbfile-devel BuildRequires: libX11-devel BuildRequires: libXrandr-devel @@ -102,7 +102,7 @@ BuildRequires: libwayland-client-devel %endif %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 -BuildRequires: ffmpeg-free-devel +BuildRequires: (ffmpeg-free-devel or ffmpeg-devel) %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -216,6 +216,7 @@ export NO_BRP_CHECK_RPATH true %changelog * Wed Dec 20 2023 FreeRDP Team - 3.0.0-2 - Exclude libuwac and librdtk +- Allow ffmpeg-devel or ffmpeg-free-devel as dependency * Tue Dec 19 2023 FreeRDP Team - 3.0.0-1 - Disable build-id - Update build dependencies