Browse Source

updated to 20.0.1132.54

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6473 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 10 years ago
parent
commit
d60eca1d38
2 changed files with 39 additions and 23 deletions
  1. 39 23
      c/chromium/chromium20-vl.spec
  2. 0 0
      c/chromium/pack_chromium20_source-vine.sh

+ 39 - 23
c/chromium/chromium19-vl.spec → c/chromium/chromium20-vl.spec

@@ -28,20 +28,20 @@
 
 %global chrome_sandbox %{_prefix}/lib/chrome_sandbox
 
-#Name:           chromium19
+#Name:           chromium20
 Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        19.0.1084.57
+Version:        20.0.1132.54
 Release:        1%{?_dist_release}
 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-19.0.1084.XXX.tar.bz2
-Source3:        pack_chromium19_source-vine.sh
+# http://gsdview.appspot.com/chromium-browser-official/chromium-20.0.1132.XXX.tar.bz2
+Source3:        pack_chromium20_source-vine.sh
 # Patch template which adds vendor to user agent
 ##!!Source20:       chromium-vendor.patch.in
 Source20:       chromium-vendor-vine.patch.in
@@ -85,6 +85,10 @@ Patch62:        chromium-norpath.patch
 Patch63:        chromium-6.0.406.0-system-gyp-v8.patch
 Patch64:        chromium-more-codec-aliases.patch
 Patch66:        chromium-sandbox-pie.patch
+Patch67:        chromium_use_gold.patch
+Patch68:        chromium-gcc47.patch
+# Upstream Patches 
+Patch500:       sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
 
 
 # Vine
@@ -129,6 +133,7 @@ BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 ##!!BuildRequires:  pkg-config
+BuildRequires:  subversion
 ##!!BuildRequires:  perl(Switch)
 BuildRequires:  perl
 BuildRequires:  cairo-devel >= 1.6
@@ -220,6 +225,9 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 %patch28 -p1
 %{?with_system_vpx:%patch32 -p1}
 %patch66 -p1
+#%patch67 -p1
+#%patch68 -p1
+%patch500 -p1
 
 
 # apply vendor patch after substitution
@@ -294,29 +302,32 @@ pushd src
 # Build the required SUID_SANDBOX helper
 %__make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release disable_nacl=1
 
+# Build the ChromeDriver test suite
+%__make -r %{?_smp_mflags} chromedriver V=1 BUILDTYPE=Release disable_nacl=1
 popd
 
 %install
 %{__rm} -rf %{buildroot}
 
-%__mkdir -p %{buildroot}%{_bindir}
+%__mkdir_p %{buildroot}%{_bindir}
 %__install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/chromium
 %ifarch x86_64
-mkdir -p %{buildroot}%{_prefix}/lib/
+%__mkdir_p %{buildroot}%{_prefix}/lib/
 %endif
 # x86_64 capable systems need this
 %__sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_bindir}/chromium
-%__mkdir -p %{buildroot}%{_libdir}/chromium/
-%__mkdir -p %{buildroot}%{_mandir}/man1/
+%__mkdir_p %{buildroot}%{_libdir}/chromium/
+%__mkdir_p %{buildroot}%{_mandir}/man1/
 pushd src/out/Release
-%__cp -a chrome_sandbox %{buildroot}%{_prefix}/lib/
-%__cp -a chrome.pak locales resources xdg-mime xdg-settings %{buildroot}%{_libdir}/chromium/
-%__cp -a resources.pak %{buildroot}%{_libdir}/chromium/
-%__cp -a chrome %{buildroot}%{_libdir}/chromium/chromium
-%{?_with_shared_library:%__cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium/}
-%{?_with_shared_library:%__cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium/}
-%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
-%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
+%__cp -a chrome_sandbox %{buildroot}%{_prefix}/lib/ || exit 1
+%__cp -a chrome.pak ui_resources_standard.pak theme_resources_standard.pak locales resources xdg-mime xdg-settings %{buildroot}%{_libdir}/chromium/ || exit 1
+%__cp -a chromedriver %{buildroot}%{_libdir}/chromium/ || exit 1
+%__cp -a resources.pak %{buildroot}%{_libdir}/chromium/ || exit 1
+%__cp -a chrome %{buildroot}%{_libdir}/chromium/chromium || exit 1
+%{?_with_shared_library:%__cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1}
+%{?_with_shared_library:%__cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1}
+%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1 || exit 1
+%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 || exit 1
 fdupes %{buildroot}%{_mandir}/man1/
 popd
 
@@ -379,24 +390,29 @@ fi || :
 %{_bindir}/chromium
 %{_libdir}/chromium/chromium
 %{_libdir}/chromium/plugins/
+%{_libdir}/chromium/locales/
 %{_libdir}/chromium/resources/
+#%{_libdir}/chromium/nacl_*
+#%{_libdir}/chromium/libppGoogleNaClPluginChrome.so
 %attr(755,root,root) %{_libdir}/chromium/xdg-settings
 %attr(755,root,root) %{_libdir}/chromium/xdg-mime
+%{_libdir}/chromium/*.pak
 %{_mandir}/man1/chrom*
-%{_datadir}/pixmaps/chromium-browser.png
-%{_datadir}/icons/hicolor/*/apps/chromium-browser.png
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
-#%{_datadir}/icons/oxygen/
-%{_libdir}/chromium/chrome.pak
-%{_libdir}/chromium/resources.pak
-%{_libdir}/chromium/locales/
+%{_datadir}/pixmaps/chromium-browser.png
+%{_datadir}/icons/hicolor/*/apps/chromium-browser.png
 %{?_with_shared_library:%{_libdir}/chromium/lib*.so}
 %attr(4755,root,root) %{chrome_sandbox}
+%{_libdir}/chromium/chromedriver
+
 
 %changelog
+* Thu Jun 28 2012 Munehiro Yamamoto <munepi@vinelinux.org> 20.0.1132.54-1
+- updated to 20.0.1132.54
+
 * Sun Jun 10 2012 Munehiro Yamamoto <munepi@vinelinux.org> 19.0.1084.57-1
--updated to 19.0.1084.57
+- updated to 19.0.1084.57
 
 * Sat Jun  2 2012 Munehiro Yamamoto <munepi@vinelinux.org> 19.0.1084.53-1
 - updated to 19.0.1084.53

+ 0 - 0
c/chromium/pack_chromium19_source-vine.sh → c/chromium/pack_chromium20_source-vine.sh