[packages/chromium-browser/DEVEL] fix ffmpeg packaging

glen glen at pld-linux.org
Sat Jan 5 19:29:28 CET 2013


commit fcc48c1917a3765de37b184429e4f0c29a8ece88
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 5 19:57:50 2013 +0200

    fix ffmpeg packaging
    
    correction to 7d0dbc8df4c9480bd1d73747128bbfade46bde38

 chromium-browser.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 05db5a6..3fdaf7c 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -69,7 +69,7 @@
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
 Version:	24.0.1312.45
-Release:	0.21
+Release:	0.22
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.gz
@@ -422,7 +422,7 @@ cp -a *.pak locales resources $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -p chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
 install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-sandbox
-%if %{with ffmpegsumo}
+%if %{without system_ffmpeg}
 install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
@@ -508,7 +508,7 @@ fi
 %attr(4555,root,root) %{_libdir}/%{name}/chromium-sandbox
 
 # ffmpeg libs
-%if %{with ffmpegsumo}
+%if %{without system_ffmpeg}
 %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/fcc48c1917a3765de37b184429e4f0c29a8ece88



More information about the pld-cvs-commit mailing list