rpms/openoffice.org/devel openoffice.org.spec,1.1590,1.1591

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22849

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#456459 3-layer OOo hits the sdk/odk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1590
retrieving revision 1.1591
diff -u -r1.1590 -r1.1591
--- openoffice.org.spec	23 Jul 2008 15:58:08 -0000	1.1590
+++ openoffice.org.spec	23 Jul 2008 22:55:52 -0000	1.1591
@@ -1514,7 +1514,8 @@
     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@,%{basisinstdir}," \
+            -e "s, at OFFICE_HOME@,%{baseinstdir}," \
+            -e "s, at OFFICE_BASE_HOME@,%{basisinstdir}," \
             -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
             -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
@@ -3576,6 +3577,7 @@
 * Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 - Resolves: rhbz#451708 ensure root certs are available for document signing
+- Resolves: rhbz#456459 3-layer OOo hits the sdk/odk
 
 * Tue Jul 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
 - next version