[openoffice.org/f14/master] Resolves: rhbz#627210 fix extensions

Caolan McNamara caolanm at fedoraproject.org
Fri Aug 27 11:22:08 UTC 2010


commit 61505d3316e8d641fba1702426a6a5f568e18751
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 27 12:21:44 2010 +0100

    Resolves: rhbz#627210 fix extensions

 openoffice.org.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index c75e3af..87a3924 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 5
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1793,6 +1793,8 @@ pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages
 ln -s %{baseinstdir}/share/uno_packages/cache cache
 popd
 pushd $RPM_BUILD_ROOT/%{oooinstdir}/share
+mv extensions/* %{baseinstdir}/extensions
+rm -rf extensions
 ln -s %{baseinstdir}/extensions extensions
 popd
 %if %{langpacks}
@@ -1802,6 +1804,7 @@ pushd $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages
 ln -s %{baseinstdir}/share/uno_packages/cache cache
 popd
 pushd $RPM_BUILD_ROOT/%{brinstdir}/share
+rm -rf extensions
 ln -s %{baseinstdir}/extensions extensions
 popd
 %endif
@@ -3823,6 +3826,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Aug 27 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-5.3
+- Resolves: rhbz#627210 fix extensions
+
 * Tue Aug 24 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-5.2
 - Resolves: rhbz#624908/ooo#114012 bad a11y chain in draw
 


More information about the scm-commits mailing list