packages: google-chrome/google-chrome.spec - up to 20.0.1132.47 stable, ado...
glen
glen at pld-linux.org
Mon Jul 2 23:18:07 CEST 2012
Author: glen Date: Mon Jul 2 21:18:07 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 20.0.1132.47 stable, adobe flash (known as pepperflash) 11.3.31.109 present on x86_64 arch as well
---- Files affected:
packages/google-chrome:
google-chrome.spec (1.60 -> 1.61)
---- Diffs:
================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.60 packages/google-chrome/google-chrome.spec:1.61
--- packages/google-chrome/google-chrome.spec:1.60 Sun Jun 24 13:06:58 2012
+++ packages/google-chrome/google-chrome.spec Mon Jul 2 23:18:02 2012
@@ -2,21 +2,21 @@
# NOTE
# - to look and update to new version, use update-source.sh script
-%define flashv 11.2.202.236
-%define svnrev 140965
+%define flashv 11.3.31.109
+%define svnrev 144678
#define rel %{nil}
%define state stable
Summary: Google Chrome
Name: google-chrome
-Version: 19.0.1084.56
+Version: 20.0.1132.47
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
-# NoSource0-md5: c6698373f6ee99e00275719f61a054ce
+Source0: http://dl.google.com/linux/chrome/rpm/%{state}/i386/%{name}-%{state}-%{version}-%{svnrev}.i386.rpm
+# NoSource0-md5: 2019a1388056b8bf5f7349cdfa0af9f2
NoSource: 0
-Source1: http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# NoSource1-md5: fe38f28c107038fcfda1679a7e4eb6d0
+Source1: http://dl.google.com/linux/chrome/rpm/%{state}/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
+# NoSource1-md5: 3569ed25382cf39c81f1b138bafd7485
NoSource: 1
Source2: %{name}.sh
Source4: find-lang.sh
@@ -28,11 +28,9 @@
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
+Provides: wwwbrowser
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,12 +42,11 @@
%define no_install_post_strip 1
%define ffmpeg_caps libffmpegsumo.so
-%define jpeg_caps libpng12.so.0(PNG12_0)
-%define flash_caps libflashplayer.so
+%define flash_caps libpepflashplayer.so
%define chrome_caps libpdf.so libppGoogleNaClPluginChrome.so
# list of script capabilities (regexps) not to be used in Provides
-%define _noautoprov %{ffmpeg_caps} %{jpeg_caps} %{flash_caps} %{chrome_caps}
+%define _noautoprov %{ffmpeg_caps} %{flash_caps} %{chrome_caps}
# do not require them either
%define _noautoreq %{_noautoprov}
@@ -111,7 +108,6 @@
Wtyczka Adobe Flash z Google Chrome, która nie jest dostępna w
Chromium.
-
%prep
%setup -qcT
%ifarch %{ix86}
@@ -140,9 +136,8 @@
# separate to subpackage
install -d browser-plugins
mv chrome/libpdf.so browser-plugins
-%ifarch %{ix86}
-mv chrome/libgcflashplayer.so browser-plugins
-%endif
+mv chrome/PepperFlash browser-plugins
+chmod a+rx browser-plugins/PepperFlash/*.so
# included in gnome-control-center-2.28.1-3
rm default-app-block default-apps/google-chrome.xml
@@ -160,14 +155,11 @@
%{__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
+v=$(awk -F'"' '/version/{print $4}' browser-plugins/PepperFlash/manifest.json)
+if [ "$v" != "%{flashv}" ]; then
: wrong version
exit 1
fi
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -190,7 +182,7 @@
done
install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
-install -p browser-plugins/*.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+cp -a browser-plugins/* $RPM_BUILD_ROOT%{_browserpluginsdir}
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
@@ -236,23 +228,54 @@
# 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
+# FIXME: link PepperFlash, browser-plugins ignores subdirs, and currently nothing else than chrome browsers can do pepper
+%triggerin -n browser-plugin-adobe-flash -- google-chrome
+test -L %{_libdir}/google-chrome/PepperFlash || ln -sf %{_browserpluginsdir}/PepperFlash %{_libdir}/google-chrome/PepperFlash
+
+%triggerun -n browser-plugin-adobe-flash -- google-chrome
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/google-chrome/PepperFlash ]; then
+ rm -f %{_libdir}/google-chrome/PepperFlash
+fi
+
%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
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/google-chrome/libpdf.so ]; then
+ rm -f %{_libdir}/google-chrome/libpdf.so
+fi
+
+%triggerin -n browser-plugin-adobe-flash -- chromium-browser
+test -L %{_libdir}/chromium-browser/PepperFlash || ln -sf %{_browserpluginsdir}/PepperFlash %{_libdir}/chromium-browser/PepperFlash
+
+%triggerun -n browser-plugin-adobe-flash -- chromium-browser
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/chromium-browser/PepperFlash ]; then
+ rm -f %{_libdir}/chromium-browser/PepperFlash
+fi
%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
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/chromium-browser/libpdf.so ]; then
+ rm -f %{_libdir}/chromium-browser/libpdf.so
+fi
+
+%triggerin -n browser-plugin-adobe-flash -- chromium-browser-bin
+test -L %{_libdir}/chromium-browser-bin/PepperFlash || ln -sf %{_browserpluginsdir}/PepperFlash %{_libdir}/chromium-browser-bin/PepperFlash
+
+%triggerun -n browser-plugin-adobe-flash -- chromium-browser-bin
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/chromium-browser-bin/PepperFlash ]; then
+ rm -f %{_libdir}/chromium-browser-bin/PepperFlash
+fi
%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
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [-L %{_libdir}/chromium-browser-bin/libpdf.so ]; then
+ rm -f %{_libdir}/chromium-browser-bin/libpdf.so
+fi
%files -f %{name}.lang
%defattr(644,root,root,755)
@@ -268,6 +291,8 @@
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/chrome.pak
%{_libdir}/%{name}/resources.pak
+%{_libdir}/%{name}/theme_resources_standard.pak
+%{_libdir}/%{name}/ui_resources_standard.pak
%dir %{_libdir}/%{name}/locales
%{_libdir}/%{name}/locales/en-US.pak
%dir %{_libdir}/%{name}/plugins
@@ -299,12 +324,11 @@
%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
+%dir %{_browserpluginsdir}/PepperFlash
+%{_browserpluginsdir}/PepperFlash/manifest.json
+%attr(755,root,root) %{_browserpluginsdir}/PepperFlash/libpepflashplayer.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -312,6 +336,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61 2012/07/02 21:18:02 glen
+- up to 20.0.1132.47 stable, adobe flash (known as pepperflash) 11.3.31.109 present on x86_64 arch as well
+
Revision 1.60 2012/06/24 11:06:58 glen
- l10n subpackage
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/google-chrome/google-chrome.spec?r1=1.60&r2=1.61
More information about the pld-cvs-commit
mailing list