[packages/google-chrome] - up to 42.0.2311.90; pdf plugin is now built-in (we don't obsolete it since people may want to use
arekm
arekm at pld-linux.org
Wed Apr 15 11:56:20 CEST 2015
commit 876c36c798e9e06227c15c44b41dbe53eb875717
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Apr 15 11:55:47 2015 +0200
- up to 42.0.2311.90; pdf plugin is now built-in (we don't obsolete it since people may want to use old pdf plugin version with other browsers)
google-chrome.spec | 57 +++++-------------------------------------------------
1 file changed, 5 insertions(+), 52 deletions(-)
---
diff --git a/google-chrome.spec b/google-chrome.spec
index 26b9526..2d4810e 100644
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -2,7 +2,7 @@
# - to look and update to new version, use update-source.sh script
%define svnrev 1
-%define flashv 17.0.0.134
+%define flashv 17.0.0.169
#define rel %{nil}
%define state stable
%if "%{state}" == "beta" || "%{state}" == "unstable"
@@ -10,15 +10,15 @@
%endif
Summary: Google Chrome
Name: google-chrome
-Version: 41.0.2272.118
+Version: 42.0.2311.90
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: 99bde408f7f92f80084f7e01bdcb4c2e
+# NoSource0-md5: b1a5b11f1e435788003a412fe9447f42
NoSource: 0
Source1: http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# NoSource1-md5: 13600317a499c7b3e65aed882d4efc29
+# NoSource1-md5: 0370709995387ec6cb87d9be9fcf77f1
NoSource: 1
Source2: %{name}.sh
Source4: find-lang.sh
@@ -32,11 +32,9 @@ Requires: fonts-Type1-urw
Requires: hicolor-icon-theme
Requires: xdg-utils >= 1.0.2-4
Suggests: browser-plugin-adobe-flash
-Suggests: browser-plugin-chrome-pdf
Provides: wwwbrowser
# add conflicts to trigger their update when main package is updated
Conflicts: browser-plugin-adobe-flash < %{flashv}-%{!?rel:1}%{?rel:%{rel}}
-Conflicts: browser-plugin-chrome-pdf < %{version}-%{release}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,10 +47,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define ffmpeg_caps libffmpegsumo.so
%define flash_caps libpepflashplayer.so
-%define chrome_caps libpdf.so
# list of script capabilities (regexps) not to be used in Provides
-%define _noautoprov %{ffmpeg_caps} %{flash_caps} %{chrome_caps}
+%define _noautoprov %{ffmpeg_caps} %{flash_caps}
# do not require them either
%define _noautoreq %{_noautoprov}
@@ -82,19 +79,6 @@ he, hi, hr, hu, id, it, ja, kn, ko, lt, lv, ml, mr, nb, nl, or, pl,
pt-BR, pt-PT, ro, ru, sk, sl, sr, sv, ta, te, th, tr, uk, vi, zh-CN,
zh-TW
-%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 < 19.0.1084.52
-
-%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
@@ -141,7 +125,6 @@ chmod a+x chrome%{?gcsuffix}/lib*.so*
# separate to subpackage
install -d browser-plugins
-mv chrome%{?gcsuffix}/libpdf.so browser-plugins
mv chrome%{?gcsuffix}/PepperFlash browser-plugins
chmod a+rx browser-plugins/PepperFlash/*.so
@@ -238,14 +221,6 @@ 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
# 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
@@ -256,14 +231,6 @@ if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/%{name}/PepperFlash ]; th
rm -f %{_libdir}/%{name}/PepperFlash
fi
-%triggerin -n browser-plugin-chrome-pdf -- google-chrome
-test -L %{_libdir}/%{name}/libpdf.so || ln -sf plugins/libpdf.so %{_libdir}/%{name}/libpdf.so
-
-%triggerun -n browser-plugin-chrome-pdf -- google-chrome
-if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/%{name}/libpdf.so ]; then
- rm -f %{_libdir}/%{name}/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
@@ -272,14 +239,6 @@ if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{_libdir}/chromium-browser-bin/Pepp
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
-if [ "$1" = "0" ] || [ "$2" = "0" ] && [-L %{_libdir}/chromium-browser-bin/libpdf.so ]; then
- rm -f %{_libdir}/chromium-browser-bin/libpdf.so
-fi
-
%files
%defattr(644,root,root,755)
@@ -292,7 +251,6 @@ fi
%{_iconsdir}/hicolor/*/apps/%{name}.png
%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/lib
%{_libdir}/%{name}/icudtl.dat
%{_libdir}/%{name}/chrome_100_percent.pak
%{_libdir}/%{name}/resources.pak
@@ -311,7 +269,6 @@ fi
%{_libdir}/%{name}/default_apps
%{_libdir}/%{name}/themes
%attr(755,root,root) %{_libdir}/%{name}/chrome
-%attr(755,root,root) %{_libdir}/%{name}/lib/libpeerconnection.so
# These unique permissions are intentional and necessary for the sandboxing
%attr(4555,root,root) %{_libdir}/%{name}/chrome-sandbox
@@ -334,10 +291,6 @@ fi
%files l10n -f %{name}.lang
%defattr(644,root,root,755)
-%files -n browser-plugin-chrome-pdf
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_browserpluginsdir}/libpdf.so
-
%files -n browser-plugin-adobe-flash
%defattr(644,root,root,755)
%dir %{_browserpluginsdir}/PepperFlash
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/google-chrome.git/commitdiff/876c36c798e9e06227c15c44b41dbe53eb875717
More information about the pld-cvs-commit
mailing list