From 271908840c727aa291811ed4351371e76a67b8c7 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 22:15:57 +0100 Subject: [PATCH] ffmpeg2-devel: remove conflicting docdir [release 2.3.3-4mamba;Thu Apr 14 2016] --- ffmpeg2.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ffmpeg2.spec b/ffmpeg2.spec index 32969b6..64a3246 100644 --- a/ffmpeg2.spec +++ b/ffmpeg2.spec @@ -9,7 +9,7 @@ Name: ffmpeg2 Epoch: 1 Version: 2.3.3 -Release: 3mamba +Release: 4mamba Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Group: System/Libraries Vendor: openmamba @@ -377,6 +377,8 @@ echo -e '%{_libdir}\n%{_libdir}/ffmpeg2/' > %{buildroot}%{_sysconfdir}/ld.so.con rm -f %{buildroot}%{_mandir}/man3/* +rm -rf %{buildroot}%{_docdir}/ffmpeg + #\ # incdir="%{buildroot}%{_includedir}/ffmpeg" \ # shlibdir="%{buildroot}%{_libdir}" \ @@ -656,10 +658,11 @@ rm -f %{buildroot}%{_mandir}/man3/* %files devel %defattr(-,root,root) -%dir %{_docdir}/ffmpeg -%{_docdir}/ffmpeg/* %changelog +* Thu Apr 14 2016 Silvan Calarco 2.3.3-4mamba +- ffmpeg2-devel: remove conflicting docdir + * Fri Mar 25 2016 Silvan Calarco 2.3.3-3mamba - allow cohexistence of devel packages with ffmpeg 3.0