build with cleaned up source

diff --git a/chromium-browser.spec b/chromium-browser.spec
index f99051a780882b3bd1f9cb34b217395825d9471a..5c083b5b4a581a2becc3ce2e9e28f80be517f6e1 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -73,8 +73,8 @@ Version:      %{branch}.%{basever}
 Release:       1
 License:       BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:         X11/Applications/Networking
-Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{branch}.%{basever}.tar.gz
-# Source0-md5: 1b273c1a80983ca7679a7031855a9b41
+Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+# Source0-md5: c14a4bcb8bed66ea2204cd698d938250
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  82e3012b5510187907bba50dadbe7137
@@ -312,7 +312,6 @@ ln -s %{SOURCE7} .
 %patch32 -p1
 %patch33 -p0
 
-exit 0
 sh -x clean-source.sh \
        %{!?with_nacl:nacl=0} \
        %{!?with_system_libvpx:libvpx=0} \
@@ -325,6 +324,7 @@ sh -x clean-source.sh \
        %{!?with_system_v8:v8=0} \
        %{!?with_system_libwebp:libwebp=0} \
        %{!?with_system_zlib:zlib=0} \
+       %{!?with_system_ffmpeg:ffmpeg=0} \
        %{nil}
 
 %build

diff --git a/get-source.sh b/get-source.sh
index 61683498d48db2132d78a231349b4af1be48aa48..4418fe082a7b096a14c607503c50d90ab64f5ea5 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -64,7 +64,7 @@ set -x
 
        if [ "$CHANNEL" != "dev" ]; then
                patch -p1 < $WORK_DIR/remove_bundled_libraries-stale.patch
-#              sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 libwebp=0
+               sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 libwebp=0 ffmpeg=0
                patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
        fi