- use flash versioning for flash package

Changed files:
    google-chrome.spec -> 1.56

diff --git a/google-chrome.spec b/google-chrome.spec
index fc3d047cf8dd3e110ebcc21cebbf77259232967b..0a05ff9e3f8be31c43861e8fcd31e30b8dccd330 100644 (file)
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -1,12 +1,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
@@ -31,6 +33,8 @@ Suggests:     browser-plugin-chrome-pdf
 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
@@ -59,9 +63,25 @@ Google Chrome egy böngésző, amely a minimalista külsőt házasítja össze
 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
 
@@ -73,17 +93,6 @@ Chromium.
 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
@@ -96,7 +105,7 @@ SOURCE=%{S:1}
 
 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
@@ -132,6 +141,14 @@ rm chrome/xdg-mime
 %{__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}