[openoffice.org/f14/master] rhbz#630344 handle upgrade from broken extension dir to fixed extension dir

[Caolan McNamara]

commit c14c806c6b68a5e48b4a27fa882686936f1a21e8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 6 15:15:17 2010 +0100

    rhbz#630344 handle upgrade from broken extension dir to fixed extension dir

 openoffice.org.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index eb4b9fd..c587410 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 6
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -2994,6 +2994,11 @@ rm -rf $RPM_BUILD_ROOT
 %{oooinstdir}/program/setuprc
 %{oooinstdir}/program/versionrc
 
+%pre core
+if [ -e %{oooinstdir}/share/extensions/extensions ]; then
+    rm -rf %{oooinstdir}/share/extensions
+fi
+
 %post core
 update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -3119,6 +3124,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_bindir}/broffice.org
 %endif
 
+%pre -n broffice.org-brand
+if [ -e %{brinstdir}/share/extensions/extensions ]; then
+    rm -rf %{brinstdir}/share/extensions
+fi
+
 %post -n broffice.org-brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -3827,6 +3837,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Mon Sep 06 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-6.2
+- rhbz#630344 handle upgrade from broken extension dir to fixed extension dir
+
 * Mon Aug 30 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-6.1
 - next milestone