|
|
@@ -8,13 +8,13 @@
|
|
|
%define with_system_icu 1
|
|
|
%endif
|
|
|
|
|
|
-%define svn_rev 56023
|
|
|
+%define svn_rev 57638
|
|
|
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 6.0.493.0
|
|
|
+Version: 7.0.507.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
@@ -22,8 +22,6 @@ Source0: %{name}.%{version}.svn%{svn_rev}.tar.lzma
|
|
|
## The following are included for source reasons only
|
|
|
# Custom build tools for chromium, hammer is a fancy front-end for scons
|
|
|
Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
|
|
|
-%{?nosrc:NoSource: 0}
|
|
|
-%{?nosrc:NoSource: 1}
|
|
|
# Script used to create the tar.lzma archive from the daily tarball downloadable at http://build.chromium.org/buildbot/archives/
|
|
|
Source2: repack_chromium_archive.sh
|
|
|
# Script used to create the tar.lzma archive from a checked out source
|
|
|
@@ -40,6 +38,11 @@ Source30: master_preferences.vine
|
|
|
#Source31: default_bookmarks.html.vine
|
|
|
# icu-4.2.1 contained in chromium.5.0.353.0.svn41449 (for Vine Linux 5.X)
|
|
|
Source100: icu-4.2.1-chromium.5.0.353.0.svn41449.tar.bz2
|
|
|
+
|
|
|
+%{?nosrc:NoSource: 0}
|
|
|
+%{?nosrc:NoSource: 1}
|
|
|
+%{?nosrc:NoSource: 100}
|
|
|
+
|
|
|
Provides: chromium-browser = %{version}
|
|
|
#Obsoletes: chromium-browser < %{version}
|
|
|
|
|
|
@@ -57,7 +60,7 @@ Patch12: chromium-no-test-sources.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
Patch14: chromium-master-prefs-path.patch
|
|
|
#Patch15: chromium-media-probe.patch
|
|
|
-Patch16: chromium-icu-code-changes.patch
|
|
|
+#Patch16: chromium-icu-code-changes.patch
|
|
|
Patch17: chromium-system-glew.patch
|
|
|
Patch18: chromium-system-expat.patch
|
|
|
Patch19: chromium-system-zlib.patch
|
|
|
@@ -188,7 +191,7 @@ cd - || exit 1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
#%patch15 -p0
|
|
|
-%{?with_system_icu:%patch16 -p1}
|
|
|
+#%{?with_system_icu:%patch16 -p1}
|
|
|
%patch17 -p1
|
|
|
%patch18 -p1
|
|
|
%patch19 -p1
|
|
|
@@ -287,7 +290,7 @@ find ./ -type f -name '*.d' | while read i; do %__rm -f $i; done
|
|
|
# Add startup file with plugins enabled
|
|
|
%{__cat} > %{buildroot}%{_bindir}/%{name} <<EOF
|
|
|
#!/bin/bash
|
|
|
-%{_libdir}/%{name}/chrome-wrapper --enable-plugins --enable-user-scripts --enable-extensions --enable-sync --enable-geolocation --enable-webgl "\$@"
|
|
|
+%{_libdir}/%{name}/chrome-wrapper --enable-plugins --enable-user-scripts --enable-extensions --enable-sync --enable-geolocation --enable-webgl --enable-nacl "\$@"
|
|
|
EOF
|
|
|
|
|
|
# # link to browser plugin path. Plugin patch doesn't work. Why?
|
|
|
@@ -302,12 +305,13 @@ pushd %{buildroot}%{_libdir}/%{name}
|
|
|
%{__ln_s} %{_libdir}/mozilla/plugins plugins
|
|
|
%endif
|
|
|
|
|
|
-#touch %{buildroot}%{_libdir}/libavcodec.so.52
|
|
|
-#%{__ln_s} %{_libdir}/libavcodec.so.52 libavcodec.so.52
|
|
|
-#touch %{buildroot}%{_libdir}/libavformat.so.52
|
|
|
-#%{__ln_s} %{_libdir}/libavformat.so.52 libavformat.so.52
|
|
|
-#touch %{buildroot}%{_libdir}/libavutil.so.50
|
|
|
-#%{__ln_s} %{_libdir}/libavutil.so.50 libavutil.so.50
|
|
|
+## support ffmpeg libs
|
|
|
+touch %{buildroot}%{_libdir}/libavcodec.so.52
|
|
|
+%{__ln_s} %{_libdir}/libavcodec.so.52 libavcodec.so.52
|
|
|
+touch %{buildroot}%{_libdir}/libavformat.so.52
|
|
|
+%{__ln_s} %{_libdir}/libavformat.so.52 libavformat.so.52
|
|
|
+touch %{buildroot}%{_libdir}/libavutil.so.50
|
|
|
+%{__ln_s} %{_libdir}/libavutil.so.50 libavutil.so.50
|
|
|
popd
|
|
|
|
|
|
# Install desktop-related files
|
|
|
@@ -342,11 +346,17 @@ desktop-file-install --vendor Vine \
|
|
|
%{_libdir}/%{name}/*
|
|
|
%config %{_sysconfdir}/%{name}
|
|
|
#%{_libdir}/browser-plugins/*
|
|
|
-#%exclude %{_libdir}/libavcodec.so.52
|
|
|
-#%exclude %{_libdir}/libavutil.so.50
|
|
|
-#%exclude %{_libdir}/libavformat.so.52
|
|
|
+%exclude %{_libdir}/libavcodec.so.52
|
|
|
+%exclude %{_libdir}/libavutil.so.50
|
|
|
+%exclude %{_libdir}/libavformat.so.52
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Aug 28 2010 Munehiro Yamamoto <munepi@vinelinux.org> 7.0.507.0-1
|
|
|
+- updated to snapshot 7.0.507
|
|
|
+
|
|
|
+* Wed Aug 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 7.0.498.0-1
|
|
|
+- updated to snapshot 7.0.498
|
|
|
+
|
|
|
* Sat Aug 14 2010 Munehiro Yamamoto <munepi@vinelinux.org> 6.0.493.0-1
|
|
|
- updated to snapshot 6.0.493
|
|
|
- used with_system_icu (for vl6)
|
munepi