updated chromium

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

c/chromium/chromium-browser-vine.desktop

@@ -11,7 +11,7 @@ Exec=chromium %u
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=chromium-browser
+Icon=chromium-browser.png
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=Chromium

c/chromium/chromium12-vl.spec

@@ -2,8 +2,6 @@
 # Thanks to Tom "spot" Callaway for much of the patchwork
 # Thanks to jhaygood for most of the icu patch
 
-# norootforbuild
-
 %define pkgname chromium
 
 #% define with_system_icu 1
@@ -19,23 +17,14 @@ Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        12.0.742.91
+Version:        12.0.742.93
 Release:        1%{?_dist_release}
 License:        BSD
 Group:          Applications/Internet
-#Source0:        %{name}.%{version}.svn%{svn_rev}.tar.lzma
-#Source0:        %{name}-%{version}.svn%{svn_rev}.tar.xz
 Source0:        %{pkgname}-%{version}.tar.xz
-## 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
-# # 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
 # Script used to create the %{pkgname}-%{version}.tar.xz archive from 
 # a official tarball: 
-# http://build.chromium.org/official/chromium-10.0.644.0.tar.bz2
+# http://build.chromium.org/official/chromium-12.0.742.XXX.tar.bz2
 Source3:        pack_chromium12_source-vine.sh
 # Official ffmpeg headers
 Source8:        ffmpeg-0.6-headers.tar.xz
@@ -47,7 +36,7 @@ Source20:       chromium-vendor-vine.patch.in
 # Set default prefs
 ##!!Source30:       master_preferences
 Source30:       master_preferences.vine
-#Source31:       default_bookmarks.html
+##!!Source31:       default_bookmarks.html
 #Source31:       default_bookmarks.html.vine
 Source99:       chrome-wrapper
 ##!!Source100:      chromium-browser.sh
@@ -59,7 +48,6 @@ Source103:      chromium-browser-rpmlintrc
 ##!!Source104:      chromium-icons.tar.bz2
 
 %{?nosrc:NoSource: 0}
-%{?nosrc:NoSource: 1}
 
 Provides:       chromium-browser = %{version}
 ##Provides:	chromium-based-browser = %{version}
@@ -185,16 +173,6 @@ Chromium は Google Chrome の後方にあるオープンソースプロジェ
 私たちの取り組みにぜひ参加してください。
 
 
-%package devel
-Summary:        Header file for chromium browser
-Group:          Development/Libraries
-Requires:       chromium = %{version}-%{release}
-
-%description devel
-This package contains the header files and pc file of chromium browser for
-applications which will use chromium browser APIs.
-
-
 %prep
 #%setup -q
 [ -d %{pkgname}-%{version} ] && %__rm -rf %{pkgname}-%{version}
@@ -222,7 +200,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 %{?with_system_v8:%patch34 -p1}
 
 pushd src/third_party/ffmpeg/
-%__tar Jxf %{SOURCE8} || exit 1
+%__tar xf %{SOURCE8} || exit 1
 ## built header file: avconfig.h
 [ -f ffmpeg-0.6-headers/libavutil/avconfig.h ] && exit 1
 cat > ffmpeg-0.6-headers/libavutil/avconfig.h <<EOF
@@ -320,8 +298,8 @@ pushd src/out/Release
 fdupes %{buildroot}%{_mandir}/man1/
 popd
 
-# %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
-# %__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
+%__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
     %__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
@@ -389,7 +367,7 @@ fi || :
 %{_libdir}/chromium/resources/
 %{_libdir}/chromium/xdg-settings
 %{_mandir}/man1/chrom*
-#%{_datadir}/pixmaps/chromium-browser.png
+%{_datadir}/pixmaps/chromium-browser.png
 %{_datadir}/icons/hicolor/*/apps/chromium-browser.png
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
@@ -407,6 +385,10 @@ fi || :
 %{_libdir}/chromium/lib*.so
 
 %changelog
+* Sat Jun 11 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.93-1
+- updated to 12.0.742.93
+- fixed icon field of chromium-browser-vine.desktop
+
 * Wed Jun 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.91-1
 - updated to 12.0.742.91