rpms/openoffice.org/devel openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch 
Log Message:
it stinks of window-isms

openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch:

Index: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch	3 Jun 2008 09:06:07 -0000	1.1
+++ openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch	4 Jun 2008 08:01:08 -0000	1.2
@@ -22,3 +22,98 @@
  # DKREGISTRYNAME is only for compatibility reasons 
  DKREGISTRYNAME=$(OFFICE_TYPE_LIBRARY)
  
+Index: setsdkenv_unix.csh.in
+===================================================================
+RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
+retrieving revision 1.10
+diff -u -r1.10 setsdkenv_unix.csh.in
+--- openoffice.org.orig/odk/setsdkenv_unix.csh.in	28 Jan 2008 16:14:56 -0000	1.10
++++ openoffice.org/odk/setsdkenv_unix.csh.in	4 Jun 2008 07:59:29 -0000
+@@ -213,41 +213,6 @@
+ #    setenv UNO_JAVA_JFW_VENDOR_SETTINGS `sp2bv $OFFICE_HOME/share/config/javavendors.xml`
+ endif
+ 
+-if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${stldebug}.${soext}" ) then
+-    setenv STLDEBUG ${stldebug}
+-else
+-    setenv STLDEBUG ""
+-endif
+-
+-
+-# For URE, prepare symbolic links for libraries:
+-rm -f "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppu.so" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+-
+-if ( -e "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+-    rm -rf "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+-endif
+-
+-if ( "${OO_SDK_URE_HOME}" != "" ) then
+-    mkdir -p "${OO_SDK_HOME}/${directoryname}/lib"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppu.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+-
+-    if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+-	ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
+-	    "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+-    endif
+-
+-endif
+-
+ echo 
+ echo " ************************************************************************"
+ echo " *"                                                  
+Index: setsdkenv_unix.sh.in
+===================================================================
+RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
+retrieving revision 1.10
+diff -u -r1.10 setsdkenv_unix.sh.in
+--- openoffice.org.orig/odk/setsdkenv_unix.sh.in	28 Jan 2008 16:15:11 -0000	1.10
++++ openoffice.org/odk/setsdkenv_unix.sh.in	4 Jun 2008 07:59:29 -0000
+@@ -276,38 +276,6 @@
+     export STLDEBUG
+ fi
+ 
+-# For URE, prepare symbolic links for libraries:
+-rm -f "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppu.${soext}" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}" \
+-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+-
+-if [ -w "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
+-then
+-    rm -rf "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+-fi
+-
+-
+-if [ "${OO_SDK_URE_HOME}" ]
+-then
+-    mkdir -p "${OO_SDK_HOME}/${directoryname}/lib"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppu.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}"
+-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+-        "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+-
+-    if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
+-    then
+-	ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
+-	    "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+-    fi
+-
+-fi
+-
+ # Prepare shell with all necessary environment variables.
+ echo 
+ echo " ************************************************************************"