Author: arekm Date: Tue Jun 5 19:08:16 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- beta channel on head; stable on CHROMIUM_19; package pepper flash plugin on
x8664
---- Files affected:
packages/chromium-browser-chrome-plugins:
chromium-browser-chrome-plugins.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index:
packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec
diff -u
packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec:1.1
packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec:1.2
---
packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec:1.1
Tue Jun 5 20:25:12 2012
+++
packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec
Tue Jun 5 21:08:11 2012
@@ -1,20 +1,20 @@
# $Revision$, $Date$
-%define svnrev 138391
-%define state stable
-%define rel 1
+%define svnrev 139451
+%define state beta
+%define rel 0.1
%define google_name google-chrome
Summary: Plugins from Google Chrome for Chromium browser
Summary(pl.UTF-8): Wtyczki z przeglądarki Google Chrome dla Chromium
Name: chromium-browser-chrome-plugins
-Version: 19.0.1084.52
+Version: 20.0.1132.21
Release: %{svnrev}.%{rel}
License: Multiple, see http://chrome.google.com/
Group: Applications/Networking
Source0:
http://dl.google.com/linux/chrome/rpm/stable/i386/%{google_name}-%{state}-%{version}-%{svnrev}.i386.rpm
-# Source0-md5: 113c4fe26c9ffda69b695d3e4c7a638f
+# Source0-md5: a7777561e078564a0ec851802de79c1f
Source1:
http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{google_name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# Source1-md5: c6e08d3019a42499f999e8f18a2e8ea4
+# Source1-md5: a2fa86e0a50dd59bb8eae9932ea18efa
URL: http://chrome.google.com/
BuildRequires: rpm-utils
BuildRequires: rpmbuild(macros) >= 1.453
@@ -31,7 +31,7 @@
%define ffmpeg_caps libffmpegsumo.so
%define jpeg_caps libpng12.so.0(PNG12_0)
-%define flash_caps libflashplayer.so
+%define flash_caps libflashplayer.so libpepflashplayer.so
%define chrome_caps libpdf.so libppGoogleNaClPluginChrome.so
# list of script capabilities (regexps) not to be used in Provides
@@ -59,7 +59,6 @@
%description pdf -l pl.UTF-8
Wtyczka PDF z Google Chrome, która nie jest dostępna w Chromium.
-%ifarch %{ix86}
%package flash_player
Summary: Adobe Flash plugin from Google Chrome
Summary(pl.UTF-8): Wtyczka Adobe Flash z Google Chrome
@@ -72,7 +71,6 @@
%description flash_player -l pl.UTF-8
Wtyczka Adobe Flash z Google Chrome, która nie jest dostępna w
Chromium.
-%endif
Wtyczka Adobe Flash z Google Chrome, która nie jest dostępna w
Chromium.
@@ -103,6 +101,9 @@
%ifarch %{ix86}
cp -a chrome/libgcflashplayer.so $RPM_BUILD_ROOT%{_libdir}/chromium-browser
%endif
+%ifarch %{x8664}
+cp -a chrome/PepperFlash $RPM_BUILD_ROOT%{_libdir}/chromium-browser
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,11 +115,16 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/chromium-browser/libpdf.so
-%ifarch %{ix86}
%files flash_player
%defattr(644,root,root,755)
+%ifarch %{ix86}
%attr(755,root,root) %{_libdir}/chromium-browser/libgcflashplayer.so
%endif
+%ifarch %{x8664}
+%dir %{_libdir}/chromium-browser/PepperFlash
+%attr(755,root,root)
%{_libdir}/chromium-browser/PepperFlash/libpepflashplayer.so
+%{_libdir}/chromium-browser/PepperFlash/manifest.json
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -126,6 +132,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2012/06/05 19:08:11 arekm
+- beta channel on head; stable on CHROMIUM_19; package pepper flash plugin on
x8664
+
Revision 1.1 2012/06/05 18:25:12 blekot
- new, based on google-chrome.spec
- contains plugins which aren't delivered with Chromium browser due to
licensing problems
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/chromium-browser-chrome-plugins/chromium-browser-chrome-plugins.spec?r1=1.1&r2=1.2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
