[packages/chromium-browser: 7/7] Merge branch 'dev-40'
glen
glen at pld-linux.org
Thu Jan 22 20:58:13 CET 2015
commit ab952b6e36d003d2ada143d07385e5c4b4538f54
Merge: e5c4162 a8cb8e5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jan 22 21:57:51 2015 +0200
Merge branch 'dev-40'
Conflicts:
chromium-browser.spec
chromium-browser.spec | 8 ++++----
clean-source.sh | 23 +++++++++++++++++------
get-source.sh | 7 +++++--
3 files changed, 26 insertions(+), 12 deletions(-)
---
diff --cc chromium-browser.spec
index df2deda,90de986..090550c
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -87,10 -87,10 +87,10 @@@ Release:
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5: 238cbf816f3d3c01a58894a32eb9995d
+ # Source0-md5: 662f134029f2d6484873ec3c93a8e049
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5: 1e03edf9545804bbc54ab3a77b1f4603
+# Patch0-md5: d127c9de90e4b146b78b3000afc4dc1e
%endif
Source1: %{name}.default
Source2: %{name}.sh
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/ab952b6e36d003d2ada143d07385e5c4b4538f54
More information about the pld-cvs-commit
mailing list