|
|
@@ -28,20 +28,20 @@
|
|
|
|
|
|
%global chrome_sandbox %{_prefix}/lib/chrome_sandbox
|
|
|
|
|
|
-#Name: chromium17
|
|
|
+#Name: chromium18
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 17.0.963.65
|
|
|
+Version: 18.0.1025.130
|
|
|
Release: 1%{?_dist_release}
|
|
|
-License: BSD
|
|
|
+License: BSD-3-Clause, LGPL-2.1+
|
|
|
Group: Applications/Internet
|
|
|
Source0: %{pkgname}-%{version}.tar.xz
|
|
|
# Script used to create the %{pkgname}-%{version}.tar.xz archive from
|
|
|
# a official tarball:
|
|
|
-# http://gsdview.appspot.com/chromium-browser-official/chromium-17.0.963.XXX.tar.bz2
|
|
|
-Source3: pack_chromium17_source-vine.sh
|
|
|
+# http://gsdview.appspot.com/chromium-browser-official/chromium-18.0.1025.XXX.tar.bz2
|
|
|
+Source3: pack_chromium18_source-vine.sh
|
|
|
# Official ffmpeg headers
|
|
|
Source8: ffmpeg-0.6-headers.tar.xz
|
|
|
#Source8: ffmpeg-0.9-headers.tar.xz
|
|
|
@@ -74,7 +74,6 @@ Conflicts: chromium-unstable
|
|
|
# OpenSuse and Fedora
|
|
|
# Many changes to the gyp systems so we can use system libraries
|
|
|
Patch1: chromium-gcc46.patch
|
|
|
-Patch4: chromium-no-sqlite-debug.patch
|
|
|
Patch8: chromium-codechanges-zlib.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
Patch14: chromium-master-prefs-path.patch
|
|
|
@@ -88,6 +87,8 @@ Patch32: chromium-7.0.542.0-system-libvpx.patch
|
|
|
Patch62: chromium-norpath.patch
|
|
|
Patch63: chromium-6.0.406.0-system-gyp-v8.patch
|
|
|
Patch64: chromium-more-codec-aliases.patch
|
|
|
+#Patch65: chromium-new-glib.patch
|
|
|
+Patch66: chromium-sandbox-pie.patch
|
|
|
|
|
|
# Vine
|
|
|
#Patch100: chromium-15.0.874.116-no-tests.patch
|
|
|
@@ -104,7 +105,8 @@ BuildRequires: desktop-file-utils
|
|
|
BuildRequires: fdupes
|
|
|
BuildRequires: flex
|
|
|
BuildRequires: freetype2-devel
|
|
|
-BuildRequires: gcc gcc-c++
|
|
|
+BuildRequires: gcc
|
|
|
+BuildRequires: gcc-c++
|
|
|
BuildRequires: gperf
|
|
|
BuildRequires: hunspell-devel
|
|
|
##!!BuildRequires: libbz2-devel
|
|
|
@@ -126,11 +128,12 @@ BuildRequires: xz
|
|
|
BuildRequires: nspr-devel
|
|
|
##!!BuildRequires: mozilla-nss-devel
|
|
|
BuildRequires: nss-devel
|
|
|
+BuildRequires: krb5-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
BuildRequires: pam-devel
|
|
|
+##!!BuildRequires: pkg-config
|
|
|
##!!BuildRequires: perl(Switch)
|
|
|
BuildRequires: perl
|
|
|
-##!!BuildRequires: pkg-config
|
|
|
BuildRequires: cairo-devel >= 1.6
|
|
|
BuildRequires: dbus-devel
|
|
|
BuildRequires: dbus-glib-devel
|
|
|
@@ -147,16 +150,19 @@ BuildRequires: sqlite3-devel
|
|
|
%{?with_system_v8:BuildRequires: v8-devel = %{v8_ver}}
|
|
|
##!!BuildRequires: wdiff
|
|
|
BuildRequires: zlib-devel
|
|
|
-
|
|
|
+##!!BuildRequires: libpulse-devel
|
|
|
+BuildRequires: pulseaudio-libs-devel
|
|
|
+##!!BuildRequires: libelf-devel
|
|
|
+BuildRequires: elfutils-libelf-devel
|
|
|
BuildRequires: libgnome-keyring-devel
|
|
|
BuildRequires: python-devel
|
|
|
-
|
|
|
#BuildRequires: glew-devel
|
|
|
BuildRequires: libevent-devel
|
|
|
%{?with_system_icu:BuildRequires: libicu-devel >= 4.0}
|
|
|
#BuildRequires: libjingle-devel >= 0.4.0-7
|
|
|
#BuildRequires: srtp-devel
|
|
|
BuildRequires: speex-devel
|
|
|
+BuildRequires: libudev-devel
|
|
|
|
|
|
##Vine Linux
|
|
|
#BuildRequires: libpaper-devel
|
|
|
@@ -204,6 +210,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
%patch62 -p1
|
|
|
%{?with_system_v8:%patch63 -p1}
|
|
|
%patch64
|
|
|
+#%patch65 -p1
|
|
|
#%patch100 -p1 -b .vine
|
|
|
%patch8 -p1
|
|
|
%patch13 -p1
|
|
|
@@ -215,7 +222,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
%patch26 -p1
|
|
|
%patch28 -p1
|
|
|
%{?with_system_vpx:%patch32 -p1}
|
|
|
-%patch4 -p1
|
|
|
+%patch66 -p1
|
|
|
|
|
|
|
|
|
pushd src/third_party/ffmpeg/
|
|
|
@@ -403,6 +410,18 @@ fi || :
|
|
|
%attr(4755,root,root) %{chrome_sandbox}
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Mar 22 2012 Munehiro Yamamoto <munepi@vinelinux.org> 18.0.1025.130-1
|
|
|
+- updated to 18.0.1025.130
|
|
|
+
|
|
|
+* Tue Mar 20 2012 Munehiro Yamamoto <munepi@vinelinux.org> 18.0.1025.114-1
|
|
|
+- updated to 18.0.1025.114
|
|
|
+
|
|
|
+* Tue Mar 20 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.81-1
|
|
|
+- updated to 17.0.963.81
|
|
|
+
|
|
|
+* Fri Mar 9 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.78-1
|
|
|
+- updated to 17.0.963.78
|
|
|
+
|
|
|
* Sat Mar 3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.65-1
|
|
|
- updated to 17.0.963.65
|
|
|
|
munepi