|
|
@@ -28,20 +28,20 @@
|
|
|
|
|
|
%global chrome_sandbox %{_prefix}/lib/chrome_sandbox
|
|
|
|
|
|
-#Name: chromium20
|
|
|
+#Name: chromium21
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 20.0.1132.54
|
|
|
+Version: 21.0.1180.78
|
|
|
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-20.0.1132.XXX.tar.bz2
|
|
|
-Source3: pack_chromium20_source-vine.sh
|
|
|
+# http://gsdview.appspot.com/chromium-browser-official/chromium-21.0.1180.XXX.tar.bz2
|
|
|
+Source3: pack_chromium21_source-vine.sh
|
|
|
# Patch template which adds vendor to user agent
|
|
|
##!!Source20: chromium-vendor.patch.in
|
|
|
Source20: chromium-vendor-vine.patch.in
|
|
|
@@ -88,7 +88,7 @@ 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
|
|
|
+#Patch500: sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
|
|
|
|
|
|
|
|
|
# Vine
|
|
|
@@ -172,9 +172,9 @@ BuildRequires: libXScrnSaver-devel
|
|
|
BuildRequires: libXtst-devel
|
|
|
BuildRequires: libXdamage-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
-%ifarch x86_64
|
|
|
-Requires: nspluginwrapper
|
|
|
-%endif
|
|
|
+#%ifarch x86_64
|
|
|
+#Requires: nspluginwrapper
|
|
|
+#%endif
|
|
|
|
|
|
##!!Requires: alsa
|
|
|
Requires: alsa-lib
|
|
|
@@ -227,7 +227,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
%patch66 -p1
|
|
|
#%patch67 -p1
|
|
|
#%patch68 -p1
|
|
|
-%patch500 -p1
|
|
|
+#%patch500 -p1
|
|
|
|
|
|
|
|
|
# apply vendor patch after substitution
|
|
|
@@ -333,7 +333,7 @@ popd
|
|
|
|
|
|
%__mkdir_p %{buildroot}%{_datadir}/pixmaps/
|
|
|
%__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
|
|
|
-for i in 16 22 24 32 48 64 128 256; do
|
|
|
+for i in 22 24 48 64 128 256; do
|
|
|
%__mkdir_p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
|
|
|
%__cp -a src/chrome/app/theme/chromium/product_logo_${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/chromium-browser.png || exit 1
|
|
|
done
|
|
|
@@ -350,11 +350,11 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
|
|
|
# %{__ln_s} %{_libdir}/browser-plugins plugins
|
|
|
# popd
|
|
|
pushd %{buildroot}%{_libdir}/%{pkgname}
|
|
|
-%ifarch x86_64
|
|
|
-%{__ln_s} %{_libdir}/mozilla/plugins-wrapped plugins
|
|
|
-%else
|
|
|
-%{__ln_s} %{_libdir}/mozilla/plugins plugins
|
|
|
-%endif
|
|
|
+#%ifarch x86_64
|
|
|
+#%{__ln_s} %{_libdir}/mozilla/plugins-wrapped plugins || exit 1
|
|
|
+#%else
|
|
|
+%{__ln_s} %{_libdir}/mozilla/plugins plugins || exit 1
|
|
|
+#%endif
|
|
|
popd
|
|
|
|
|
|
# Install the master_preferences file
|
|
|
@@ -408,6 +408,10 @@ fi || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Aug 10 2012 Munehiro Yamamoto <munepi@vinelinux.org> 21.0.1180.78-1
|
|
|
+- updated to 20.0.1132.54
|
|
|
+- dropped Requires: nspluginwrapper
|
|
|
+
|
|
|
* Thu Jun 28 2012 Munehiro Yamamoto <munepi@vinelinux.org> 20.0.1132.54-1
|
|
|
- updated to 20.0.1132.54
|
|
|
|
munepi