[packages/ffmpeg] fix doc bcond

glen glen at pld-linux.org
Fri Nov 20 12:22:08 CET 2015


commit eaa9ad7b45b2e6af6772fa1ca3349bc9cebae168
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Nov 20 13:21:57 2015 +0200

    fix doc bcond

 ffmpeg.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c2fa385..172092d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -461,6 +461,7 @@ EOF
 	--disable-debug \
 	--disable-optimizations \
 	--disable-stripping \
+	%{!?with_doc:--disable-doc} \
 	--enable-avfilter \
 	--enable-avresample \
 	%{?with_decklink:--enable-decklink} \
@@ -589,7 +590,9 @@ install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 
 # packaged as %doc in -doc
+%if %{with doc}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/ffmpeg/*.html
+%endif
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/ffmpeg/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/eaa9ad7b45b2e6af6772fa1ca3349bc9cebae168



More information about the pld-cvs-commit mailing list