rpms/openoffice.org/devel openoffice.org.spec,1.1665,1.1666

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5725

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#465515 use --force to avoid any problems with replacing existing extensions


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -r1.1665 -r1.1666
--- openoffice.org.spec	3 Oct 2008 09:32:05 -0000	1.1665
+++ openoffice.org.spec	4 Oct 2008 13:18:40 -0000	1.1666
@@ -2930,7 +2930,7 @@
 
 %post report-builder
     # register extension
-    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
 
 %preun report-builder
 if [ $1 -eq 0 ]; then
@@ -2955,7 +2955,7 @@
 
 %post bsh
     # register extension
-    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null || :
 
 %preun bsh
 if [ $1 -eq 0 ]; then
@@ -2981,7 +2981,7 @@
 
 %post rhino
     # register extension
-    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null || :
 
 %preun rhino
 if [ $1 -eq 0 ]; then
@@ -3006,7 +3006,7 @@
 
 %post wiki-publisher
     # register extension
-    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
 
 %preun wiki-publisher
 if [ $1 -eq 0 ]; then
@@ -3031,7 +3031,7 @@
 
 %post presentation-minimizer
     # register extension
-    unopkg add --shared --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
 
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
@@ -3056,7 +3056,7 @@
 
 %post presenter-screen
     # register extension
-    unopkg add --shared --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
 
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
@@ -3081,7 +3081,7 @@
 
 %post pdfimport
     # register extension
-    unopkg add --shared --link %{baseinstdir}/extensions/pdfimport.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/pdfimport.oxt > /dev/null || :
 
 %preun pdfimport
 if [ $1 -eq 0 ]; then
@@ -3668,7 +3668,7 @@
 
 %post pyuno
     # register extension
-    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null || :
 
 %preun pyuno
 if [ $1 -eq 0 ]; then
@@ -3681,8 +3681,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Oct 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.2
+* Sat Oct 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.2
 - Resolves: rhbz#465427 wrong order of seds
+- Resolves: rhbz#465515 use --force to avoid any potential problems where
+  upgrading a hand-added extension
 
 * Wed Oct 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.1
 - next candidate