X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=google-chrome.spec;h=970ad4181231bc70399b126328730a69df4696e7;hb=fadb1c32badc0d85692d2526ebdf8d2059b0abef;hp=a3c7593f214672ce70a402abffbdb6179ec0ecc7;hpb=456768d2209fe96bb204c774e0a2bf8a0fec0630;p=packages%2Fgoogle-chrome.git diff --git a/google-chrome.spec b/google-chrome.spec index a3c7593..970ad41 100644 --- a/google-chrome.spec +++ b/google-chrome.spec @@ -1,19 +1,22 @@ # NOTE # - to look and update to new version, use update-source.sh script -%define svnrev 116452 +%define flashv 11.2.202.236 +%define svnrev 140965 +#define rel %{nil} %define state stable -%define rel 1 Summary: Google Chrome Name: google-chrome -Version: 16.0.912.75 -Release: %{svnrev}.%{rel} +Version: 19.0.1084.56 +Release: %{svnrev}%{?rel:.%{rel}} License: Multiple, see http://chrome.google.com/ Group: Applications/Networking Source0: http://dl.google.com/linux/chrome/rpm/stable/i386/%{name}-%{state}-%{version}-%{svnrev}.i386.rpm -# Source0-md5: ed08cb2891058db3a62a5b2399aa7fea +# NoSource0-md5: c6698373f6ee99e00275719f61a054ce +NoSource: 0 Source1: http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm -# Source1-md5: 1baa28b426b607b95f7a9629d9a62887 +# NoSource1-md5: fe38f28c107038fcfda1679a7e4eb6d0 +NoSource: 1 Source2: %{name}.sh Source4: find-lang.sh Patch0: chrome-desktop.patch @@ -22,11 +25,18 @@ BuildRequires: rpm-utils BuildRequires: rpmbuild(macros) >= 1.453 BuildRequires: sed >= 4.0 Requires: browser-plugins >= 2.0 +Requires: hicolor-icon-theme Requires: xdg-utils >= 1.0.2-4 Provides: wwwbrowser +%ifarch %{ix86} +Suggests: browser-plugin-adobe-flash +%endif +Suggests: browser-plugin-chrome-pdf ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%{expand:%%define crver %{version}} + %define find_lang sh find-lang.sh %{buildroot} %define _enable_debug_packages 0 @@ -55,6 +65,39 @@ Google Chrome egy böngésző, amely a minimalista külsőt házasítja össze a kifinomult technológiával, hogy a webböngészés gyorsabb, biztonságosabb és könnyebb legyen. +%package -n browser-plugin-chrome-pdf +Summary: Chrome PDF Viewer +Summary(pl.UTF-8): Wtyczka PDF z Google Chrome +Group: X11/Applications/Graphics +Requires: browser-plugins >= 2.0 +Conflicts: google-chrome < 16.0.912.75 + +%description -n browser-plugin-chrome-pdf +Google Chrome PDF Viewer. + +%description -n browser-plugin-chrome-pdf -l pl.UTF-8 +Wtyczka PDF z Google Chrome. + +# IMPORTANT: keep flash plugin defined as last package +%package -n browser-plugin-adobe-flash +Summary: Adobe Flash plugin from Google Chrome +Summary(pl.UTF-8): Wtyczka Adobe Flash z Google Chrome +Version: %{flashv} +Release: %{!?rel:1}%{?rel:%{rel}} +License: Free to use, non-distributable +Group: X11/Applications/Multimedia +Requires: browser-plugins >= 2.0 +Conflicts: google-chrome < 16.0.912.75 + +%description -n browser-plugin-adobe-flash +Adobe Flash plugin from Google Chrome, which is not available in +Chromium. + +%description -n browser-plugin-adobe-flash -l pl.UTF-8 +Wtyczka Adobe Flash z Google Chrome, która nie jest dostępna w +Chromium. + + %prep %setup -qcT %ifarch %{ix86} @@ -66,7 +109,7 @@ SOURCE=%{S:1} V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE) R=$(rpm -qp --nodigest --nosignature --qf '%{R}' $SOURCE) -if [ version:$V != version:%{version} -o svnrev:$R != svnrev:%{svnrev} ]; then +if [ version:$V != version:%{crver} -o svnrev:$R != svnrev:%{svnrev} ]; then exit 1 fi rpm2cpio $SOURCE | cpio -i -d @@ -80,6 +123,13 @@ mv chrome/google-chrome.desktop . mv chrome/google-chrome . chmod a+x chrome/lib*.so* +# separate to subpackage +install -d browser-plugins +mv chrome/libpdf.so browser-plugins +%ifarch %{ix86} +mv chrome/libgcflashplayer.so browser-plugins +%endif + # included in gnome-control-center-2.28.1-3 rm default-app-block default-apps/google-chrome.xml @@ -95,9 +145,19 @@ rm chrome/xdg-mime %{__sed} -i 's;/opt/google/chrome/product_logo_48.png;%{name}.png;' google-chrome.desktop %{__sed} -i 's;/opt/google/chrome;%{_bindir};' google-chrome.desktop +%build +%ifarch %{ix86} +s=$(echo 'LNX %{flashv}' | tr . ,) +v=$(strings browser-plugins/libgcflashplayer.so | grep '^LNX ') +if [ "$v" != "$s" ]; then + : wrong version + exit 1 +fi +%endif + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}/themes} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_desktopdir},%{_libdir}/%{name}/themes} install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name} %{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name} @@ -105,11 +165,27 @@ cp -a chrome/* $RPM_BUILD_ROOT%{_libdir}/%{name} cp -p google-chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1 # for google-chrome --help echo ".so google-chrome.1" > $RPM_BUILD_ROOT%{_mandir}/man1/chrome.1 -cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png -cp -a google-chrome.desktop $RPM_BUILD_ROOT%{_desktopdir} +cp -p google-chrome.desktop $RPM_BUILD_ROOT%{_desktopdir} + +for icon in product_logo_*.png; do + size=${icon##product_logo_} + size=${size%.png} + + install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}/apps + cp -p $icon $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}/apps/%{name}.png +done + +install -d $RPM_BUILD_ROOT%{_browserpluginsdir} +install -p browser-plugins/*.so $RPM_BUILD_ROOT%{_browserpluginsdir} %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins +# binary needs to be at that specific location, or it will abort: +# [1070:1070:3265429789299:FATAL:zygote_host_linux.cc(130)] The SUID sandbox helper binary is missing: /opt/google/chrome/chrome-sandbox Aborting now. +# Aborted +install -d $RPM_BUILD_ROOT/opt/google +ln -s %{_libdir}/%{name} $RPM_BUILD_ROOT/opt/google/chrome + # find locales %find_lang %{name}.lang @@ -117,13 +193,51 @@ cp -a google-chrome.desktop $RPM_BUILD_ROOT%{_desktopdir} rm -rf $RPM_BUILD_ROOT %post +%update_icon_cache hicolor %update_browser_plugins %postun +if [ "$1" = 0 ]; then + %update_icon_cache hicolor + %update_browser_plugins +fi + +%post -n browser-plugin-adobe-flash +%update_browser_plugins + +%postun -n browser-plugin-adobe-flash if [ "$1" = 0 ]; then %update_browser_plugins fi +%post -n browser-plugin-chrome-pdf +%update_browser_plugins + +%postun -n browser-plugin-chrome-pdf +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + +# FIXME: chrome *needs* it to be in application dir. add symlink until it can load from other places +# for chromium, we could likely patch source +%triggerin -n browser-plugin-chrome-pdf -- google-chrome +test -L %{_libdir}/google-chrome/libpdf.so || ln -sf plugins/libpdf.so %{_libdir}/google-chrome/libpdf.so + +%triggerun -n browser-plugin-chrome-pdf -- google-chrome +rm -f %{_libdir}/google-chrome/libpdf.so + +%triggerin -n browser-plugin-chrome-pdf -- chromium-browser +test -L %{_libdir}/chromium-browser/libpdf.so || ln -sf plugins/libpdf.so %{_libdir}/chromium-browser/libpdf.so + +%triggerun -n browser-plugin-chrome-pdf -- chromium-browser +rm -f %{_libdir}/chromium-browser/libpdf.so + +%triggerin -n browser-plugin-chrome-pdf -- chromium-browser-bin +test -L %{_libdir}/chromium-browser-bin/libpdf.so || ln -sf plugins/libpdf.so %{_libdir}/chromium-browser-bin/libpdf.so + +%triggerun -n browser-plugin-chrome-pdf -- chromium-browser-bin +rm -f %{_libdir}/chromium-browser-bin/libpdf.so + %files -f %{name}.lang %defattr(644,root,root,755) @@ -132,8 +246,9 @@ fi %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/*.1* -%{_pixmapsdir}/%{name}.png %{_desktopdir}/*.desktop +%{_iconsdir}/hicolor/*/apps/%{name}.png + %dir %{_libdir}/%{name} %{_libdir}/%{name}/chrome.pak %{_libdir}/%{name}/resources.pak @@ -148,14 +263,6 @@ fi # Native Client plugin, to use launch with --enable-nacl %attr(755,root,root) %{_libdir}/%{name}/libppGoogleNaClPluginChrome.so -%attr(755,root,root) %{_libdir}/%{name}/libpdf.so - -%ifarch %{ix86} -# flash player -%{_libdir}/%{name}/plugin.vch -%attr(755,root,root) %{_libdir}/%{name}/libgcflashplayer.so -%endif - # nacl %attr(755,root,root) %{_libdir}/%{name}/nacl_helper %attr(755,root,root) %{_libdir}/%{name}/nacl_helper_bootstrap @@ -163,3 +270,18 @@ fi # ffmpeg libs %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so + +# hack +%dir /opt/google +/opt/google/chrome + +%files -n browser-plugin-chrome-pdf +%defattr(644,root,root,755) +%attr(755,root,root) %{_browserpluginsdir}/libpdf.so + +%ifarch %{ix86} +%files -n browser-plugin-adobe-flash +%defattr(644,root,root,755) +%{_libdir}/%{name}/plugin.vch +%attr(755,root,root) %{_browserpluginsdir}/libgcflashplayer.so +%endif