packages: google-chrome/google-chrome.spec - use flash versioning for flash...

[glen]

Author: glen                         Date: Thu Jun  7 17:37:43 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use flash versioning for flash package

---- Files affected:
packages/google-chrome:
   google-chrome.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.55 packages/google-chrome/google-chrome.spec:1.56
--- packages/google-chrome/google-chrome.spec:1.55	Thu Jun  7 19:01:20 2012
+++ packages/google-chrome/google-chrome.spec	Thu Jun  7 19:37:38 2012
@@ -2,12 +2,14 @@
 # NOTE
 # - to look and update to new version, use update-source.sh script
 
+%define		flashv	11.2.202.235
 %define		svnrev	138391
+#define		rel		%{nil}
 %define		state	stable
 Summary:	Google Chrome
 Name:		google-chrome
 Version:	19.0.1084.52
-Release:	%{svnrev}
+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
@@ -32,6 +34,8 @@
 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
@@ -60,9 +64,25 @@
 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
+
+%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
 
@@ -74,17 +94,6 @@
 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
@@ -97,7 +106,7 @@
 
 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
@@ -133,6 +142,14 @@
 %{__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
+s=$(echo 'LNX %{flashv}' | tr . ,)
+v=$(strings browser-plugins/libgcflashplayer.so | grep '^LNX ')
+if [ "$v" != "$s" ]; then
+	: wrong version
+	exit 1
+fi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_mandir}/man1,%{_desktopdir},%{_libdir}/%{name}/themes}
@@ -270,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2012/06/07 17:37:38  glen
+- use flash versioning for flash package
+
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/google-chrome/google-chrome.spec?r1=1.55&r2=1.56