- up to 19.0.1084.56

[packages/google-chrome.git] / google-chrome.spec

diff --git a/google-chrome.spec b/google-chrome.spec
index 0a05ff9e3f8be31c43861e8fcd31e30b8dccd330..970ad4181231bc70399b126328730a69df4696e7 100644 (file)
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -1,20 +1,22 @@
 # NOTE
 # - to look and update to new version, use update-source.sh script
 
-%define                flashv  11.2.202.235
-%define                svnrev  138391
+%define                flashv  11.2.202.236
+%define                svnrev  140965
 #define                rel             %{nil}
 %define                state   stable
 Summary:       Google Chrome
 Name:          google-chrome
-Version:       19.0.1084.52
+Version:       19.0.1084.56
 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
-# Source0-md5: 113c4fe26c9ffda69b695d3e4c7a638f
+# NoSource0-md5:       c6698373f6ee99e00275719f61a054ce
+NoSource:      0
 Source1:       http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# Source1-md5: c6e08d3019a42499f999e8f18a2e8ea4
+# NoSource1-md5:       fe38f28c107038fcfda1679a7e4eb6d0
+NoSource:      1
 Source2:       %{name}.sh
 Source4:       find-lang.sh
 Patch0:                chrome-desktop.patch
@@ -68,6 +70,7 @@ 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 < 16.0.912.75
 
 %description -n browser-plugin-chrome-pdf
 Google Chrome PDF Viewer.
@@ -84,6 +87,7 @@ Release:      %{!?rel:1}%{?rel:%{rel}}
 License:       Free to use, non-distributable
 Group:         X11/Applications/Multimedia
 Requires:      browser-plugins >= 2.0
+Conflicts:     google-chrome < 16.0.912.75
 
 %description -n browser-plugin-adobe-flash
 Adobe Flash plugin from Google Chrome, which is not available in
@@ -142,12 +146,14 @@ rm chrome/xdg-mime
 %{__sed} -i 's;/opt/google/chrome;%{_bindir};' google-chrome.desktop
 
 %build
+%ifarch %{ix86}
 s=$(echo 'LNX %{flashv}' | tr . ,)
 v=$(strings browser-plugins/libgcflashplayer.so | grep '^LNX ')
 if [ "$v" != "$s" ]; then
        : wrong version
        exit 1
 fi
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -215,19 +221,19 @@ 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
+test -L %{_libdir}/google-chrome/libpdf.so || ln -sf 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
+test -L %{_libdir}/chromium-browser/libpdf.so || ln -sf 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
+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
 rm -f %{_libdir}/chromium-browser-bin/libpdf.so