rpms/ffmpeg/devel ffmpeg.spec,1.114,1.115

Author: kwizart Update of /cvs/free/rpms/ffmpeg/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24353 Modified Files: ffmpeg.spec Log Message: Disable libcelt by default - orphaned upstream Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- ffmpeg.spec 2 Sep 2014 05:46:39 -0000 1.114 +++ ffmpeg.spec 13 Sep 2014 17:15:10 -0000 1.115 @@ -5,7 +5,6 @@ #global rel rc1 %if 0%{?rhel} -%global _without_celt 1 %global _without_frei0r 1 %global _without_opencv 1 %global _without_vpx 1 @@ -14,7 +13,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 2.3.3 -Release: 1%{?date}%{?date:git}%{?rel}%{?dist} +Release: 2%{?date}%{?date:git}%{?rel}%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ %else @@ -28,7 +27,7 @@ %endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: bzip2-devel -%{!?_without_celt:BuildRequires: celt-devel} +%{?_with_celt:BuildRequires: celt-devel} %{?_with_dirac:BuildRequires: dirac-devel} %{?_with_faac:BuildRequires: faac-devel} BuildRequires: freetype-devel @@ -118,7 +117,7 @@ --enable-gnutls \\\ --enable-libass \\\ %{!?_without_cdio:--enable-libcdio} \\\ - %{!?_without_celt:--enable-libcelt} \\\ + %{?_with_celt:--enable-libcelt} \\\ --enable-libdc1394 \\\ %{?_with_dirac:--enable-libdirac} \\\ %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ @@ -282,6 +281,9 @@ %changelog +* Sat Sep 13 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.3-2 +- Disable libcelt by default - rfbz#3359 + * Tue Sep 02 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 2.3.3-1 - Updated to 2.3.3