[openoffice.org/f13/master] Resolves: rhbz#660312 SDK setup script creates invalid variables

[David Tardon]

commit 7ddd16b5184bde77dcd97fd3b15f76bcf598fc63
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 6 14:44:58 2010 +0100

    Resolves: rhbz#660312 SDK setup script creates invalid variables

 openoffice.org.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index c2f4612..787fdcc 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -2022,7 +2022,7 @@ pushd $RPM_BUILD_ROOT/%{sdkinstdir}
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
             -e "s, at OO_SDK_HOME@,%{sdkinstdir}," \
-            -e "s, at OFFICE_HOME@,%{baseinstdir}," \
+            -e "s, at OFFICE_HOME@,%{oooinstdir}," \
             -e "s, at OFFICE_BASE_HOME@,%{basisinstdir}," \
             -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
@@ -4283,10 +4283,12 @@ fi
 %endif
 
 %changelog
-* Tue Nov 30 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.35-UNBUILT
+* Mon Dec 06 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.35-UNBUILT
 - Resolves: rhbz#648475 Crash in scanner dialog
 - Resolves: rhbz#657628 divide-by-zero
 - Resolves: rhbz#657718 Crash in SwObjectFormatterTxtFrm
+- Resolves: rhbz#660312 SDK setup script creates invalid variables
+  (dtardon)
 
 * Tue Oct 26 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.34
 - Resolves: rhbz#636521 crash in undo in sc