updated chromium-vl.spec

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

c/chromium/chromium-vl.spec

@@ -3,24 +3,32 @@
 # Thanks to jhaygood for most of the icu patch
 
 # norootforbuild
+%define with_devel_pkg 0
 
-%if %{?_dist_release} == "vl6"
-%define with_system_icu 1
-%endif
+%define pkgname chromium
+
+#% define with_system_icu 1
+#% define with_system_v8 1
+
+#NOTE: src/third_party/ffmpeg/ffmpeg.gyp: 
+#     libvpx doesn't currently supply a pkg-config file, so we assume that
+#     -lvpx is sufficient.
+%define with_system_vpx 1
 
-%define v8_ver 3.0.12
+#% define v8_ver 3.2.0
 
+#Name:           chromium11
 Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        10.0.651.0
-Release:        2%{?_dist_release}
+Version:        11.0.696.15
+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:        %{name}-%{version}.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
@@ -28,10 +36,10 @@ Source1:        http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
 # 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 %{name}-%{version}.tar.xz archive from 
+# 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
-Source3:        pack_chromium_source-vine.sh
+Source3:        pack_chromium11_source-vine.sh
 # Official ffmpeg headers
 Source8:        ffmpeg-0.6-headers.tar.xz
 #Source10:       chromium.desktop
@@ -58,11 +66,11 @@ Source103:      chromium-browser-rpmlintrc
 Provides:       chromium-browser = %{version}
 ##Provides:	chromium-based-browser = %{version}
 ##Obsoletes:      chromium-browser < %{version}
+##Conflicts:      chromium
 
 ## Start Patches
 # Many changes to the gyp systems so we can use system libraries
 # My first ever patch set.  I hope I did well.
-Patch3:         chromium-gyp-system-icu.patch
 Patch4:         chromium-no-sqlite-debug.patch
 Patch5:         chromium-gyp-system-04-nss-nspr.patch
 Patch7:         chromium-codechanges-nss-nspr.patch
@@ -75,36 +83,24 @@ Patch18:        chromium-system-expat.patch
 Patch19:        chromium-system-zlib.patch
 Patch20:        chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
 Patch21:        chromium-7.0.542.0-media-probe.patch
-Patch23:        chromium-disable-mmx.patch
 Patch25:        tcmalloc-factory.patch
 Patch26:        chromium-remoting-build-fix.diff
 Patch28:        chromium-7.0.500.0-system-speex.patch
 Patch29:        chromium-7.0.510.0-system-ffmpeg.patch
-Patch30:        chromium-7.0.510.0-fstat.patch
 Patch32:        chromium-7.0.542.0-system-libvpx.patch
 Patch34:        chromium-7.0.542.0-codechanges-system-minizip-v8.patch
-# Shared Library patches
-Patch60:        chromium-sharedlibfixes.patch
-#Patch61:        chromium-shared-chromiumthreading.patch
 Patch62:        chromium-norpath.patch
 Patch63:        chromium-6.0.406.0-system-gyp-v8.patch
 # Patches for MeeGo Netbook
 Patch80:        chromium-browser-window-focus.patch
-Patch81:        chromium-20100319-default-browser-setting.patch
-Patch82:        chromium-20100506-expose-chromium-browser-api.patch
 Patch83:        chromium-fix-toolbar-icon-size.patch
 
-Patch98:	chromium-gyp-external-icu.patch
-
 # Vine
+Patch100:       chromium-11.0.696.15-no-tests.patch
 
 
 BuildRequires:  gcc gcc-c++
-%if %{?_dist_release} == "vl5"
-BuildRequires:  libstdc++34 libstdc++34-devel
-%elseif %{?_dist_release} == "vl6"
 BuildRequires:  libstdc++ libstdc++-devel
-%endif
 BuildRequires:  libevent
 ##!!BuildRequires:  pkg-config
 BuildRequires:  python
@@ -113,7 +109,8 @@ BuildRequires:  python-pyxml
 BuildRequires:  perl bison flex gperf
 ##!!BuildRequires:  wdiff
 ##!!BuildRequires:  update-desktop-files 
-BuildRequires:  lzma
+#BuildRequires:  lzma
+BuildRequires:  xz
 ##!!BuildRequires:  mozilla-nss-devel
 BuildRequires:  nss-devel
 ##!!BuildRequires:  alsa-devel 
@@ -135,22 +132,17 @@ BuildRequires:  zlib-devel
 ##!!BuildRequires:  libbz2-devel 
 BuildRequires:  bzip2-devel
 BuildRequires:  cups-devel
-%if %{?_dist_release} == "vl6"
 BuildRequires:  fdupes
-%endif
 ##!!BuildRequires:  libexpat-devel
 BuildRequires:  expat-devel
 BuildRequires:  libpng-devel
 BuildRequires:  sqlite3-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  v8-devel = %{v8_ver}
-BuildRequires:  libvpx-devel >= 0.9.5
-%if %{?_dist_release} == "vl5"
-BuildRequires:  gnome-keyring-devel
-%elseif %{?_dist_release} == "vl6"
+%{?with_system_v8:BuildRequires:  v8-devel = %{v8_ver}}
+%{?with_system_vpx:BuildRequires:  libvpx-devel >= 0.9.5}
+BuildRequires:  pam-devel
 BuildRequires:  libgnome-keyring-devel
-%endif
 BuildRequires:  python-devel
 BuildRequires:  glew-devel
 ##!!BuildRequires:  Mesa-devel
@@ -164,7 +156,7 @@ BuildRequires:  libevent-devel
 BuildRequires:  speex-devel
 
 ##Vine Linux
-Requires:       v8 = %{v8_ver}
+%{?with_system_v8:Requires:       v8 = %{v8_ver}}
 BuildRequires:  libpaper-devel
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  libXtst-devel
@@ -212,20 +204,16 @@ applications which will use chromium browser APIs.
 
 
 %prep
-%setup -q
+#%setup -q
+[ -d %{pkgname}-%{version} ] && %__rm -rf %{pkgname}-%{version}
+xz -dc %{SOURCE0} | %__tar -xf - || exit 1
+%setup -D -T -n %{pkgname}-%{version}
 
-#%patch60 -p1
-#%patch61 -p1
 %patch62 -p1
-%patch63 -p1
+%{?with_system_v8:%patch63 -p1}
+%patch100 -p1 -b .vine
 %patch80 -p1
-#%patch81 -p1
-%patch82 -p1
 %patch83 -p1
-
-# use system libicu only if >= 4.0
-%{?with_system_icu:%patch3 -p1}
-
 %patch4 -p1
 %patch5 -p1
 %patch7 -p1
@@ -239,15 +227,11 @@ applications which will use chromium browser APIs.
 %patch20 -p1
 %patch21 -p1
 %patch25 -p1
-%ifarch %ix86
-%patch23 -p1
-%endif
 %patch26 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
-%patch32 -p1
-%patch34 -p1
+%{?with_system_vpx:%patch32 -p1}
+%{?with_system_v8:%patch34 -p1}
 
 pushd src/third_party/ffmpeg/
 %__tar Jxf %{SOURCE8} || exit 1
@@ -262,7 +246,9 @@ cat > ffmpeg-0.6-headers/libavutil/avconfig.h <<EOF
 EOF
 popd
 
-%__rm -rf src/third_party/libvpx/ src/third_party/speex/
+#%__rm -rf src/third_party/libvpx/
+%__rm -rf src/third_party/speex/
+%__rm -rf src/third_party/nss src/third_party/nspr
 
 # apply vendor patch after substitution
 %__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
@@ -288,6 +274,7 @@ pushd src
 ./build/gyp_chromium -f make build/all.gyp \
     -Dlinux_sandbox_path=%{_libdir}/chromium/chrome-sandbox \
     -Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium-browser \
+    -Duse_openssl=0 \
     -Duse_system_ffmpeg=1 \
     -Duse_system_zlib=1 \
     -Duse_system_libpng=1 \
@@ -297,11 +284,14 @@ pushd src
     -Duse_system_libxml=1 \
     -Duse_system_libxslt=1 \
     -Duse_system_libevent=1 \
-    -Duse_system_vpx=1 \
+    %{?with_system_vpx:-Duse_system_vpx=1} \
+    %{!?with_system_vpx:-Duse_system_vpx=0} \
     -Dproprietary_codecs=1 \
     -Dlibrary=shared_library \
     -Djavascript_engine=v8 \
     -Dlinux_fpic=1 \
+    %{?with_system_v8:-Duse_system_v8=1} \
+    %{!?with_system_v8:-Duse_system_v8=0} \
     %{?with_system_icu:-Duse_system_icu=1} \
     %{!?with_system_icu:-Duse_system_icu=0} \
     %ifarch %{ix86}
@@ -341,12 +331,11 @@ pushd src/out/Release
 #%__cp -a chrome_sandbox %{buildroot}%{_libdir}/chromium/chrome-sandbox
 %__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
 %__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
-%if %{?_dist_release} == "vl6"
 fdupes %{buildroot}%{_mandir}/man1/
-%endif
 popd
 
 # devel package install
+%if %{with_devel_pkg}
 mkdir -p %{buildroot}%{_libdir}/chromium/include
 pushd src
 find base -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
@@ -361,12 +350,10 @@ find net -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/in
 find third_party/skia -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
 find third_party/WebKit -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
 find webkit -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
-find gfx -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
+#find gfx -name "*.h" -exec %__cp --parents {} %{buildroot}%{_libdir}/chromium/include \;
 popd
 find %{buildroot}%{_libdir}/chromium/include -name "*.h" -exec chmod 644 {} \;
-%if %{?_dist_release} == "vl6"
 fdupes %{buildroot}%{_libdir}/chromium/include
-%endif
 
 %__mkdir_p %{buildroot}/%{_libdir}/pkgconfig
 cat <<EOF > %{buildroot}/%{_libdir}/pkgconfig/chromium-browser.pc
@@ -376,6 +363,8 @@ Version: 1.0.1
 Libs: -L%{_libdir}/chromium -lapp_base -lappcache -lbase_i18n -lbase -lblob -lbrowser -lcacheinvalidation -lchrome_gpu -lchromoting_base -lchromoting_client -lchromoting_host -lchromoting_jingle_glue -lchromoting_protocol -lchromotocol_proto_lib -lcld -lcommon_constants -lcommon_net -lcommon -ldatabase -ldebugger -ldefault_plugin -ldynamic_annotations -lffmpeg -lfileapi -lgfx -lglue -lgoogleurl -lgtest -lharfbuzz_interface -lharfbuzz -lhttp_listen_socket -lhunspell -liccjpeg -lil -linstaller_util -lipc -ljingle_p2p -ljingle -lmedia -lmodp_b64 -lnet_base -lnet -lnotifier -lomx_wrapper -lots -lpcre -lppapi_plugin -lplugin -lprinting -lprofile_import -lprotobuf_lite -lrenderer -lsandbox -lsdch -lservice -lskia_opts -lskia -lsqlite3 -lsrtp -lssl_host_info -lssl -lsymbolize -lsyncapi -lsync_notifier -lsync -ltrace_proto_lib -lundoview -lutility -lwebcore_bindings -lwebcore_html -lwebcore_platform -lwebcore_remaining -lwebcore_svg -lwebkit -lwebkit_user_agent -lwebp -lworker -lwtf -lxdg_mime -lzlib 
 Cflags: -I%{_libdir}/chromium/include -I%{_libdir}/chromium/include/skia/config
 EOF
+%endif
+
 
 %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
 %__cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png
@@ -388,10 +377,10 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
 
 # # link to browser plugin path.  Plugin patch doesn't work. Why?
 # %{__mkdir_p} %{buildroot}%{_libdir}/browser-plugins
-# pushd %{buildroot}%{_libdir}/%{name}
+# pushd %{buildroot}%{_libdir}/%{pkgname}
 # %{__ln_s} %{_libdir}/browser-plugins plugins
 # popd
-pushd %{buildroot}%{_libdir}/%{name}
+pushd %{buildroot}%{_libdir}/%{pkgname}
 %ifarch x86_64
 %{__ln_s} %{_libdir}/mozilla/plugins-wrapped plugins
 %else
@@ -408,10 +397,10 @@ touch %{buildroot}%{_libdir}/libavutil.so.50
 popd
 
 # Install the master_preferences file
-%__mkdir_p %{buildroot}%{_sysconfdir}/%{name}
-#%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}
-%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}/$(basename %{SOURCE30} .vine)
-#%__install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{name}
+%__mkdir_p %{buildroot}%{_sysconfdir}/%{pkgname}
+#%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{pkgname}
+%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{pkgname}/$(basename %{SOURCE30} .vine)
+#%__install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{pkgname}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -419,7 +408,7 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/%{name}
+%config %{_sysconfdir}/%{pkgname}
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/default-apps
 %{_bindir}/chromium
@@ -446,12 +435,23 @@ popd
 %{_libdir}/chromium/locales/
 %{_libdir}/chromium/lib*.so
 
+%if %{with_devel_pkg}
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/chromium/include/
 %{_libdir}/pkgconfig/chromium-browser.pc
+%endif
 
 %changelog
+* Sat Mar 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.15-1
+- updated to 11.0.696.15
+  - ready for Vine Linux 6 release
+- dropped BuildRequires: v8-devel, libvpx-devel, libicu-devel
+
+* Wed Mar 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.5-1
+- updated to 11.0.696.5 with v8 3.2.0
+- added BuildRequires: pam-devel
+
 * Thu Feb 10 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 10.0.651.0-2
 - rebuilt with libevent-2.0.10