commit 1fbbc6954b92a60224ef20e0288f7c00e91335d9 Merge: 605214a d2a41bd Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Mon Feb 5 17:02:42 2018 +0100 Merge branch 'master' into f27 .gitignore | 2 + sources | 2 +- xpra-codecs-freeworld-ffmpeg35.patch | 189 +++++++++++++++++++++++++++++++++++ xpra-codecs-freeworld.spec | 18 +++- 4 files changed, 209 insertions(+), 2 deletions(-) --- diff --cc xpra-codecs-freeworld.spec index 13481a4,21d710a..38c0bd2 --- a/xpra-codecs-freeworld.spec +++ b/xpra-codecs-freeworld.spec @@@ -50,7 -55,10 +55,11 @@@ x264 and ffmpeg %prep %setup -q -n xpra-%{version} + + %if 0%{?fedora} > 27 + %patch0 -p1 + %endif + %build CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \ %{?_with_enc_x264} \