updated chromium-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@783 ec354946-7b23-47d6-9f5a-488ba84defc7

c/chromium/chromium-vl.spec

@@ -4,15 +4,18 @@
 
 # norootforbuild
 
-%define svn_rev 41449
+#% define with_system_icu 1
+
+%define svn_rev 43947
 
 Name:           chromium
 Summary:        Google's opens source browser project
+Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        5.0.353.0
-Release:        4%{?_dist_release}
+Version:        5.0.372.0
+Release:        1%{?_dist_release}
 License:        BSD
-Group:          Productivity/Networking/Web/Browsers
+Group:          Applications/Internet
 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
@@ -22,8 +25,10 @@ Source1:        http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
 # 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
-Source3:        pack_chromium_source.sh
-Source10:       chromium.desktop
+#Source3:        pack_chromium_source.sh
+Source3:        pack_chromium_source-vine.sh
+#Source10:       chromium.desktop
+Source10:       chromium-vine.desktop
 # Patch template which adds vendor to user agent
 ##!!Source20:       chromium-vendor.patch.in
 Source20:       chromium-vendor-vine.patch.in
@@ -46,13 +51,21 @@ Patch11:        chromium-fix-home-kde4-path.patch
 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
+Patch17:        chromium-system-glew.patch
+Patch18:        chromium-system-expat.patch
+Patch19:        chromium-system-zlib.patch
+Patch20:        chromium-noffmpeg.patch
+Patch21:        chromium-system-old-ffmpeg-way.patch
+Patch22:        chromium-libpng14.patch
 
 # Vine
 #Patch40:       chromium-5.0.353-no-ffmpeg-vine.patch
 
 ## Gentoo patches
 # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-Patch50: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
+#Patch50: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
 
 BuildRequires:  gcc gcc-c++
 %if %{?_dist_release} == "vl5"
@@ -96,6 +109,7 @@ BuildRequires:  fdupes
 %endif
 ##!!BuildRequires:  libexpat-devel
 BuildRequires:  expat-devel
+BuildRequires:  glew-devel
 ##!!BuildRequires:  Mesa-devel
 BuildRequires:  mesa-libGLU-devel
 
@@ -115,11 +129,26 @@ Requires:  nspluginwrapper
 Requires:       alsa-lib
 # shouldn't be required to name all dependencies
 # Requires:       mozilla-nss mozilla-nspr gtk2 glib2 cairo >= 1.6 freetype2 dbus-1 alsa v8 >= 1.3.15
+## Recommends the ffmpeg libraries (available from packman)
+#Recommends:     libavcodec52 libavformat52 libavutil50
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
-Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications.
+Chromium is the open-source project behind Google Chrome. 
+We invite you to join us in our effort to help build a safer, faster, 
+and more stable way for all Internet users to experience the web, 
+and to create a powerful platform for developing a new generation of 
+web applications.
+
+%description -l ja
+Chromium は Google Chrome の後方にあるオープンソースプロジェクトです。
+私たちは、ウェブを体験しているすべてのインターネットユーザに対して
+より安全で、より速くて、より安定した方法を築き上げるのを助けるために、
+ウェブアプリケーションの新しい世代を発展させるように
+強力なプラットホームを作成するために、
+私たちの取り組みで私たちに加わるようにあなたを誘います。
+
 
 %prep
 [ -d %{name} ] && %__rm -rf %{name}
@@ -139,10 +168,14 @@ lzma -cd %{SOURCE0} | tar xf -
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-
-#%patch40 -p1 -b .vine
-
-%patch50 -p0 -b .html5
+%patch15 -p0
+%{?with_system_icu:%patch16 -p1}
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 # apply vendor patch after substitution
 %__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
@@ -191,6 +224,8 @@ pushd src
 #%__make -r -j5 chrome BUILDTYPE=Release
 %__make %{?_smp_mflags} chrome BUILDTYPE=Release
 
+popd
+
 %install
 %{__rm} -rf %{buildroot}
 
@@ -224,7 +259,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 "\$@"
+%{_libdir}/%{name}/chrome-wrapper --enable-plugins --enable-user-scripts --enable-extensions --enable-sync --enable-geolocation --enable-webgl "\$@"
 EOF
 
 # # link to browser plugin path.  Plugin patch doesn't work. Why?
@@ -238,6 +273,13 @@ pushd %{buildroot}%{_libdir}/%{name}
 %else
 %{__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
 popd
 
 # Install desktop-related files
@@ -253,6 +295,10 @@ desktop-file-install --vendor Vine			\
 #%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}
 %__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}/$(basename %{SOURCE30} .vine)
 
+## install o3d plugin
+#pushd src/o3d/build/out/Release
+#%{__cp} -rf * %{buildroot}%{_libdir}/browser-plugins
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -266,12 +312,35 @@ desktop-file-install --vendor Vine			\
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_libdir}/%{name}/*
-%{_sysconfdir}/%{name}
+%config %{_sysconfdir}/%{name}
+#%{_libdir}/browser-plugins/*
+#%exclude %{_libdir}/libavcodec.so.52
+#%exclude %{_libdir}/libavutil.so.50
+#%exclude %{_libdir}/libavformat.so.52
 
 %changelog
-* Fri Apr  2 2010 IWAI, Masaharu <iwai@alib.jp> 5.0.353.0-4vl5
-- build on Vine Linux 5.1
-  - add BuildRequires: libstdc++34 libstdc++34-devel for Vine5
+* Sat Apr 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.372.0-1
+- updated to snapshot 5.0.372.0 r43947
+- added BuildRequires: glew-devel
+- changed Group tag to Applications/Internet
+- added Summary(ja) and %%description -l ja 
+
+* Mon Apr 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.365.0-1
+- updated to snapshot 5.0.365.0 r42966
+- merged 5.0.353.0-4vl5
+ * Fri Apr  2 2010 IWAI, Masaharu <iwai@alib.jp> 5.0.353.0-4vl5
+ - build on Vine Linux 5.1
+   - add BuildRequires: libstdc++34 libstdc++34-devel for Vine5
+
+* Sat Mar 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.364.0-1
+- updated to snapshot 5.0.364.0 r42779
+
+* Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.359.0-1
+- updated to snapshot 5.0.359.0 r42116
+- dropped chromium-20100122-ubuntu-html5-video-mimetypes.patch
+
+* Tue Mar 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.353.0-4
+- fixed master_preferences.vine, little
 
 * Tue Mar 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.353.0-3
 - fixed to install master_preferences