From: Jan Rękorajski Date: Sun, 25 Nov 2012 18:56:32 +0000 (+0100) Subject: - expllicit req for webrtc-libilbc to avoid confusion with libilbc X-Git-Tag: auto/th/ffmpeg-1.0-4 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=92a3edff20a23206bd5388081b62d9a13b5ff5eb;p=packages%2Fffmpeg.git - expllicit req for webrtc-libilbc to avoid confusion with libilbc (different ABI, same soname) - rel 4 --- diff --git a/ffmpeg.spec b/ffmpeg.spec index 4717e5e..4ff59df 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -26,7 +26,7 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg Version: 1.0 -Release: 3 +Release: 4 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, some filters, x264, xavs, xvid, x11grab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) @@ -115,6 +115,7 @@ BuildRequires: zlib-devel # overflows maximum hash table size BuildConflicts: pdksh < 5.2.14-57 Requires: %{name}-libs = %{version}-%{release} +%{?with_ilbc:Requires: webrtc-libilbc} Requires: xvid >= 1:1.1.0 Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)