up to 22.0.1229.94

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

diff --git a/google-chrome.spec b/google-chrome.spec
index f260ff10ad0e08d2b053e32695f46fa178cd711a..0dfb6821fd30929d165ffcad5c259ed6901242c5 100644 (file)
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -1,21 +1,21 @@
 # NOTE
 # - to look and update to new version, use update-source.sh script
 
-%define                flashv  11.3.31.115
-%define                svnrev  145807
+%define                flashv  11.4.31.110
+%define                svnrev  161065
 #define                rel             %{nil}
 %define                state   stable
 Summary:       Google Chrome
 Name:          google-chrome
-Version:       20.0.1132.57
+Version:       22.0.1229.94
 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
-# NoSource0-md5:       c55444fdd9420d0ce24811c25d9335af
+# NoSource0-md5:       8f7e6178b33b0dcdf17347543d7ee3ff
 NoSource:      0
 Source1:       http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
-# NoSource1-md5:       39d703e081a4896b7659a06518d7366f
+# NoSource1-md5:       c28196952e7c94b5ab808f72b6a48951
 NoSource:      1
 Source2:       %{name}.sh
 Source4:       find-lang.sh
@@ -30,6 +30,9 @@ Requires:     xdg-utils >= 1.0.2-4
 Suggests:      browser-plugin-adobe-flash
 Suggests:      browser-plugin-chrome-pdf
 Provides:      wwwbrowser
+# add conflicts to trigger their update when main package is updated
+Conflicts:     browser-plugin-adobe-flash < %{flashv}-%{!?rel:1}%{?rel:%{rel}}
+Conflicts:     browser-plugin-chrome-pdf < %{version}-%{release}
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -80,7 +83,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
+Conflicts:     google-chrome < 19.0.1084.52
 
 %description -n browser-plugin-chrome-pdf
 Google Chrome PDF Viewer.
@@ -97,7 +100,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
+Conflicts:     google-chrome < 19.0.1084.52
 
 %description -n browser-plugin-adobe-flash
 Adobe Flash plugin from Google Chrome, which is not available in
@@ -262,7 +265,7 @@ if [ "$1" = "0" ] || [ "$2" = "0" ] && [-L %{_libdir}/chromium-browser-bin/libpd
        rm -f %{_libdir}/chromium-browser-bin/libpdf.so
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
@@ -276,8 +279,8 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
 %{_libdir}/%{name}/resources.pak
-%{_libdir}/%{name}/theme_resources_standard.pak
-%{_libdir}/%{name}/ui_resources_standard.pak
+%{_libdir}/%{name}/theme_resources_*.pak
+%{_libdir}/%{name}/ui_resources_*.pak
 %dir %{_libdir}/%{name}/locales
 %{_libdir}/%{name}/locales/en-US.pak
 %dir %{_libdir}/%{name}/plugins