packages: google-chrome/google-chrome.spec - use ln -f for clean upgrade re...

[glen]

Author: glen                         Date: Thu Jun  7 19:06:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use ln -f for clean upgrade replacing file with link

---- Files affected:
packages/google-chrome:
   google-chrome.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.57 packages/google-chrome/google-chrome.spec:1.58
--- packages/google-chrome/google-chrome.spec:1.57	Thu Jun  7 20:53:45 2012
+++ packages/google-chrome/google-chrome.spec	Thu Jun  7 21:05:57 2012
@@ -69,6 +69,7 @@
 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.
@@ -85,6 +86,7 @@
 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
@@ -218,19 +220,19 @@
 # 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
@@ -289,6 +291,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2012/06/07 19:05:57  glen
+- use ln -f for clean upgrade replacing file with link
+
 Revision 1.57  2012/06/07 18:53:45  glen
 - fix 64bit build
 
================================================================

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