packages: chromium-browser/chromium-browser.spec, chromium-browser/chromium...

[glen]

Author: glen                         Date: Fri Mar  4 15:41:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 11.0.691.0, r76865, system vpx patch upstream

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.102 -> 1.103) , chromium-system-vpx.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.102 packages/chromium-browser/chromium-browser.spec:1.103
--- packages/chromium-browser/chromium-browser.spec:1.102	Tue Mar  1 21:06:27 2011
+++ packages/chromium-browser/chromium-browser.spec	Fri Mar  4 16:41:50 2011
@@ -29,18 +29,18 @@
 # or:
 # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
 
-%define		svndate	20110301
-%define		svnver	76345
+%define		svndate	20110304
+%define		svnver	76865
 %define		rel	1
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	11.0.687.0
+Version:	11.0.691.0
 Release:	0.%{svnver}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5:	5d2a301c48d636b6d1df6d8331f45773
+# Source0-md5:	62de113711d3d9ac7b678d407bee4da8
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source4:	find-lang.sh
@@ -53,7 +53,6 @@
 Patch4:		search-workaround.patch
 Patch5:		options-support.patch
 Patch6:		get-webkit_revision.patch
-Patch7:		chromium-system-vpx.patch
 URL:		http://code.google.com/chromium/
 BuildRequires:	GConf2-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -86,7 +85,7 @@
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
 BuildRequires:	python
-# grep gyp.googlecode.com src/DEPS | cut -d'"' -f2 | cut -d@ -f2
+# grep googlecode_url.*gyp src/DEPS |cut -d'"' -f6 | cut -d@ -f2
 BuildRequires:	python-gyp >= 1-840
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.453
@@ -122,8 +121,6 @@
 rebranded (name and logo) with very few additions such as usage
 tracking and an auto-updater system.
 
-This package contains the Chromium browser.
-
 %package inspector
 Summary:	Page inspector for the chromium-browser
 Group:		Development/Tools
@@ -179,9 +176,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-cd src
-%patch7 -p0
-cd ..
 
 # drop bundled libs, from gentoo
 remove_bundled_lib() {
@@ -199,7 +193,8 @@
 remove_bundled_lib "third_party/libevent"
 remove_bundled_lib "third_party/libjpeg"
 remove_bundled_lib "third_party/libpng"
-remove_bundled_lib "third_party/libvpx"
+# third_party/libvpx/libvpx.h should be kept
+#remove_bundled_lib "third_party/libvpx"
 remove_bundled_lib "third_party/libxml"
 remove_bundled_lib "third_party/libxslt"
 remove_bundled_lib "third_party/zlib"
@@ -330,6 +325,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2011/03/04 15:41:50  glen
+- up to 11.0.691.0, r76865, system vpx patch upstream
+
 Revision 1.102  2011/03/01 20:06:27  charles
 - updated Source0-md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.102&r2=1.103&f=u