rpms/openoffice.org/FC-4 workspace.fpicandrpath.patch, NONE, 1.1 workspace-fpicker4.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13107

Added Files:
	workspace.fpicandrpath.patch 
Removed Files:
	workspace-fpicker4.patch 
Log Message:
renamed patch

workspace.fpicandrpath.patch:
 binfilter/bf_sd/source/ui/app/makefile.mk  |    7 ++++++-
 binfilter/bf_sd/util/makefile.mk           |    4 ++--
 binfilter/bf_sw/source/ui/app/makefile.mk  |    4 ++++
 binfilter/bf_sw/source/ui/app/sw_swlib.cxx |    4 ++--
 binfilter/bf_sw/util/makefile.mk           |   10 +++++++---
 pyuno/source/module/makefile.mk            |   14 +++++++++-----
 sw/source/filter/basflt/makefile.mk        |    2 --
 sw/util/makefile.mk                        |    3 ++-
 8 files changed, 32 insertions(+), 16 deletions(-)

--- NEW FILE workspace.fpicandrpath.patch ---
Index: bf_sd/source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/source/ui/app/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sd/source/ui/app/makefile.mk	18 Nov 2003 19:23:05 -0000	1.3
+++ openoffice.org/binfilter/bf_sd/source/ui/app/makefile.mk	17 Jun 2005 19:37:20 -0000	1.3.140.1
@@ -107,7 +107,7 @@ SRC1FILES =	\
 
 OBJFILES = \
 		$(OBJ)$/sd_sdlib.obj	\
-		$(OBJ)$/sd_sdresid.obj	\
+		$(OBJ)$/sd_sdresid.obj
 
 SLOFILES =	\
         $(SLO)$/sd_sdmod.obj		\
@@ -126,6 +126,11 @@ EXCEPTIONSFILES= \
 		$(SLO)$/sd_sdxfer.obj		\
 		$(SLO)$/sd_sdmod1.obj		
 
+LIB3TARGET=$(SLB)$/bf_ysdlib.lib
+LIB3OBJFILES=\
+		$(SLO)$/sd_sdlib.obj \
+	     	$(SLO)$/sd_sdresid.obj
+
 .IF "$(GUI)" == "WNT"
 
 NOOPTFILES=\
Index: bf_sd/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/util/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sd/util/makefile.mk	11 Nov 2003 15:30:14 -0000	1.3
+++ openoffice.org/binfilter/bf_sd/util/makefile.mk	17 Jun 2005 19:37:21 -0000	1.3.140.1
@@ -200,8 +200,8 @@ LIB3FILES=      \
 LIB4TARGET=$(LB)$/bf_sdlib.lib
 LIB4ARCHIV=$(LB)$/libbf_sdlib.a
 .IF "$(GUI)"=="UNX"
-LIB4OBJFILES=$(OBJ)$/sd_sdlib.obj \
-		  $(OBJ)$/sd_sdresid.obj
+LIB4OBJFILES=$(SLO)$/sd_sdlib.obj \
+		  $(SLO)$/sd_sdresid.obj
 .ELSE
 .IF "$(GUI)"=="MAC"
 LIB4OBJFILES=$(OBJ)$/sd_sdlib.obj \
Index: bf_sw/source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/source/ui/app/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sw/source/ui/app/makefile.mk	18 Nov 2003 19:24:44 -0000	1.3
+++ openoffice.org/binfilter/bf_sw/source/ui/app/makefile.mk	17 Jun 2005 19:37:21 -0000	1.3.140.1
@@ -147,6 +147,10 @@ LIB1OBJFILES= \
 		$(SLO)$/sw_version.obj	 \
 		$(SLO)$/sw_swwait.obj
 
+LIB3TARGET=$(SLB)$/bf_yswlib.lib
+LIB3OBJFILES=\
+	$(SLO)$/sw_swlib.obj \
+	$(SLO)$/sw_swcomlib.obj
 
 # --- Targets ------------------------------------------------------
 
Index: bf_sw/source/ui/app/sw_swlib.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/source/ui/app/sw_swlib.cxx,v
retrieving revision 1.3
retrieving revision 1.3.110.1
diff -u -p -r1.3 -r1.3.110.1
--- openoffice.org.orig/binfilter/bf_sw/source/ui/app/sw_swlib.cxx	3 Aug 2004 18:32:27 -0000	1.3
+++ openoffice.org/binfilter/bf_sw/source/ui/app/sw_swlib.cxx	17 Jun 2005 19:37:21 -0000	1.3.110.1
@@ -111,9 +111,9 @@
 #include <web.hrc>
 #include <globdoc.hrc>
 
-#ifndef _IODETECT_HXX
+#undef _DLL_
 #include <iodetect.hxx>
-#endif
+
 namespace binfilter {
 
 #define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
Index: bf_sw/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/util/makefile.mk,v
retrieving revision 1.5
retrieving revision 1.5.122.1
diff -u -p -r1.5 -r1.5.122.1
--- openoffice.org.orig/binfilter/bf_sw/util/makefile.mk	13 Jul 2004 16:26:41 -0000	1.5
+++ openoffice.org/binfilter/bf_sw/util/makefile.mk	17 Jun 2005 19:37:22 -0000	1.5.122.1
@@ -173,13 +173,17 @@ RESLIB1SRSFILES= \
 
 LIB1TARGET=$(LB)$/bf_swlib.lib
 LIB1ARCHIV=$(LB)$/libbf_swlib.a
+.IF "$(GUI)"=="UNX"
+LIB1OBJFILES= \
+		$(SLO)$/sw_swlib.obj \
+		$(SLO)$/sw_swcomlib.obj \
+		$(SLO)$/sw_w4wflt.obj
+.ELSE
 LIB1OBJFILES= \
 		$(OUT)$/obj$/sw_swlib.obj \
 		$(OUT)$/obj$/sw_swcomlib.obj \
 		$(OUT)$/obj$/sw_w4wflt.obj
-
-
-
+.ENDIF
 
 SHL2TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
 SHL2VERSIONMAP= $(TARGET).map
Index: source/module/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
retrieving revision 1.9
retrieving revision 1.9.8.1
diff -u -p -r1.9 -r1.9.8.1
--- openoffice.org.orig/pyuno/source/module/makefile.mk	16 Feb 2005 16:45:24 -0000	1.9
+++ openoffice.org/pyuno/source/module/makefile.mk	16 Jun 2005 11:19:43 -0000	1.9.8.1
@@ -145,16 +145,20 @@ $(DLLDEST)$/%.py: %.py
 .IF "$(GUI)" == "UNX"
 $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
 .IF "$(OS)" == "LINUX"
-	$(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "SOLARIS"
-	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "FREEBSD"
-	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "NETBSD"
-	$(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "MACOSX"
-	$(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+.ELSE
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ENDIF
+	cat $(MISC)$/$(@:b).cmd
+	@source $(MISC)$/$(@:b).cmd
 .ENDIF
 
 
Index: source/filter/basflt/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/filter/basflt/makefile.mk,v
retrieving revision 1.7
retrieving revision 1.7.472.1
diff -u -p -r1.7 -r1.7.472.1
--- openoffice.org.orig/sw/source/filter/basflt/makefile.mk	4 Oct 2004 19:15:35 -0000	1.7
+++ openoffice.org/sw/source/filter/basflt/makefile.mk	16 Jun 2005 09:51:55 -0000	1.7.472.1
@@ -86,8 +86,6 @@ SLOFILES =  \
 EXCEPTIONSFILES = \
                 $(SLO)$/fltini.obj
 
-OBJFILES = $(OBJ)$/w4wflt.obj
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
retrieving revision 1.48
retrieving revision 1.48.140.1
diff -u -p -r1.48 -r1.48.140.1
--- openoffice.org.orig/sw/util/makefile.mk	15 Mar 2005 10:07:25 -0000	1.48
+++ openoffice.org/sw/util/makefile.mk	16 Jun 2005 09:51:56 -0000	1.48.140.1
@@ -185,6 +185,7 @@ SHL2STDLIBS= \
             $(SOTLIB) \
             $(TOOLSLIB) \
 	    $(UCBHELPERLIB) \
+	    $(UNOTOOLSLIB) \
             $(COMPHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
@@ -193,7 +194,7 @@ SHL2STDLIBS= \
 SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/swdet2.obj \
         $(SLO)$/detreg.obj  \
-            $(OUT)$/obj$/w4wflt.obj
+            $(SLO)$/w4wflt.obj
 
 .IF "$(product)"==""
 SHL2OBJS+=  \


--- workspace-fpicker4.patch DELETED ---