Author: glen Date: Thu Jun 7 17:01:25 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- extra packages for pdf and flash plugins to be reused with chromium-browser
package
based on chromium-browser-chrome-plugins.spec
---- Files affected:
packages/google-chrome:
google-chrome.spec (1.54 -> 1.55)
---- Diffs:
================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.54
packages/google-chrome/google-chrome.spec:1.55
--- packages/google-chrome/google-chrome.spec:1.54 Sun May 27 12:48:29 2012
+++ packages/google-chrome/google-chrome.spec Thu Jun 7 19:01:20 2012
@@ -4,11 +4,10 @@
%define svnrev 138391
%define state stable
-%define rel 1
Summary: Google Chrome
Name: google-chrome
Version: 19.0.1084.52
-Release: %{svnrev}.%{rel}
+Release: %{svnrev}
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
@@ -26,6 +25,10 @@
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)
@@ -57,6 +60,32 @@
a kifinomult technológiával, hogy a webböngészés gyorsabb,
biztonságosabb és könnyebb legyen.
+%package -n browser-plugin-adobe-flash
+Summary: Adobe Flash plugin from Google Chrome
+Summary(pl.UTF-8): Wtyczka Adobe Flash z Google Chrome
+Group: X11/Applications/Multimedia
+Requires: browser-plugins >= 2.0
+
+%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.
+
+%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
+
+%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.
+
%prep
%setup -qcT
%ifarch %{ix86}
@@ -82,6 +111,13 @@
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
@@ -117,6 +153,9 @@
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:
@@ -141,6 +180,42 @@
%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 -s 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 -s 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 -s 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)
@@ -166,14 +241,6 @@
# 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
@@ -186,12 +253,27 @@
%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
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2012/06/07 17:01:20 glen
+- extra packages for pdf and flash plugins to be reused with chromium-browser
package
+ based on chromium-browser-chrome-plugins.spec
+
Revision 1.54 2012/05/27 10:48:29 caleb
- Up to 19.0.1084.52
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/google-chrome/google-chrome.spec?r1=1.54&r2=1.55
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
