diff --git a/ffmpeg.spec b/ffmpeg.spec index 4bc89ae..63f7dce 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -9,7 +9,7 @@ Name: ffmpeg Epoch: 1 Version: 4.1 -Release: 2mamba +Release: 3mamba Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Group: System/Libraries Vendor: openmamba @@ -79,6 +79,7 @@ BuildRequires: tetex >= 3.0 BuildRequires: libass-devel BuildRequires: libenca-devel Obsoletes: libffmpeg +Obsoletes: libav BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -109,6 +110,7 @@ Group: System/Libraries Provides: libswscale Obsoletes: libswscale Obsoletes: libswscale-ffmpeg1 +Obsoletes: libswscale-libav %description -n libswscale-ffmpeg ffmpeg video scaling library. @@ -119,6 +121,7 @@ Group: Development/Libraries Requires: libswscale-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libswscale-devel Obsoletes: libswscale-devel +Obsoletes: libswscale-libav-devel %description -n libswscale-ffmpeg-devel ffmpeg video scaling library. @@ -130,6 +133,7 @@ Summary: ffmpeg resampling library Group: System/Libraries Provides: libswresample Obsoletes: libswresample-ffmpeg1 +Obsoletes: libswresample-libav %description -n libswresample-ffmpeg ffmpeg resampling library. @@ -139,6 +143,7 @@ Summary: Shared header files and static libraries part of ffmpeg Group: Development/Libraries Requires: libswresample-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libresample-devel +Obsoletes: libswresample-libav-devel %description -n libswresample-ffmpeg-devel ffmpeg resampling library. @@ -151,6 +156,7 @@ Group: System/Libraries Requires: ffmpegpresets Provides: libavcodec Obsoletes: libavcodec +Obsoletes: libavcodec-libav %description -n libavcodec-ffmpeg ffmpeg library implementing various Audio/Video codecs. @@ -161,6 +167,7 @@ Group: Development/Libraries Requires: libavcodec-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libavcodec-devel Obsoletes: libavcodec-devel +Obsoletes: libavcodec-libav-devel %description -n libavcodec-ffmpeg-devel ffmpeg library implementing various Audio/Video codecs. @@ -171,6 +178,7 @@ Summary: ffmpeg device handling library Group: System/Libraries Provides: libavdevice Obsoletes: libavdevice +Obsoletes: libavdevice-libav-devel %description -n libavdevice-ffmpeg ffmpeg device handling library. @@ -181,6 +189,7 @@ Group: Development/Libraries Requires: libavdevice-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libavdevice-devel Obsoletes: libavdevice-devel +Obsoletes: libavdevice-libav-devel %description -n libavdevice-ffmpeg-devel ffmpeg device handling library. @@ -192,6 +201,7 @@ Summary: ffmpeg filtering library Group: System/Libraries Provides: libavfilter Obsoletes: libavfilter +Obsoletes: libavfilter-libav %description -n libavfilter-ffmpeg ffmpeg filtering library. @@ -202,6 +212,7 @@ Group: Development/Libraries Requires: libavfilter-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libavfilter-devel Obsoletes: libavfilter-devel +Obsoletes: libavfilter-libav-devel %description -n libavfilter-ffmpeg-devel ffmpeg filtering library. @@ -213,6 +224,7 @@ Summary: ffmpeg format library Group: System/Libraries Provides: libavformat Obsoletes: libavformat +Obsoletes: libavformat-libav %description -n libavformat-ffmpeg ffmpeg format library. @@ -223,6 +235,7 @@ Group: Development/Libraries Requires: libavformat-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libavformat-devel Obsoletes: libavformat-devel +Obsoletes: libavformat-libav-devel %description -n libavformat-ffmpeg-devel ffmpeg format library. @@ -234,6 +247,7 @@ Summary: Shared library part of ffmpeg Group: System/Libraries Provides: libavutil Obsoletes: libavutil +Obsoletes: libavutil-libav %description -n libavutil-ffmpeg Shared library part of ffmpeg @@ -244,6 +258,7 @@ Group: Development/Libraries Requires: libavutil-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libavutil-devel Obsoletes: libavutil-devel +Obsoletes: libavutil-libav-devel %description -n libavutil-ffmpeg-devel This is the common utility library from the ffmpeg project. @@ -257,6 +272,7 @@ Group: System/Libraries Provides: libpostproc Obsoletes: libpostproc Obsoletes: libpostproc-ffmpeg1 +Obsoletes: libpostproc-libav %description -n libpostproc-ffmpeg FFmpeg is a very fast video and audio converter. It can also grab from a live audio/video source. @@ -269,6 +285,7 @@ Group: Development/Libraries Requires: libpostproc-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} Provides: libpostproc-devel Obsoletes: libpostproc-devel +Obsoletes: libpostproc-libav-devel %description -n libpostproc-ffmpeg-devel FFmpeg is a very fast video and audio converter. It can also grab from a live audio/video source. @@ -278,6 +295,7 @@ This package contains only ffmpeg's postproc post-processing headers and static %package -n libavresample-ffmpeg Summary: ffmpeg resample library Group: System/Libraries +Obsoletes: libavresample-libav %description -n libavresample-ffmpeg FFmpeg resample library. @@ -286,6 +304,7 @@ FFmpeg resample library. Summary: Shared header files and static libraries part of ffmpeg libavresample Group: System/Libraries Requires: libavresample-ffmpeg = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: libavresample-libav-devel %description -n libavresample-ffmpeg-devel FFmpeg resample library. @@ -303,6 +322,7 @@ Requires: libavutil-ffmpeg-devel Requires: libpostproc-ffmpeg-devel Requires: libswscale-ffmpeg-devel Requires: libswresample-ffmpeg-devel +Obsoletes: libav-devel %description devel This is a virtual package that contains the dependencies necessary for installing all the FFmpeg development packages. @@ -629,6 +649,9 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_docdir}/ffmpeg/* %changelog +* Fri Dec 21 2018 Silvan Calarco 4.1-3mamba +- obsolete -libav packages + * Fri Dec 07 2018 Silvan Calarco 4.1-2mamba - rebuilt with debug package