rpms/openoffice.org/devel workspace.cmcfixes19.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	workspace.cmcfixes19.patch 
Log Message:
clobbering eachother

workspace.cmcfixes19.patch:
 config_office/configure.in                           |    2 ++
 filter/prj/build.lst                                 |    2 +-
 filter/source/config/fragments/makefile.mk           |    8 ++++----
 readlicense_oo/docs/readme.xsl                       |    2 +-
 readlicense_oo/util/makefile.pmk                     |   12 ++++--------
 sc/addin/datefunc/makefile.mk                        |    2 +-
 sc/addin/rot13/makefile.mk                           |    2 +-
 sc/util/makefile.mk                                  |    3 ++-
 scp2/source/ooo/file_ooo.scp                         |    2 ++
 scp2/source/ooo/makefile.mk                          |    4 ++++
 svx/source/intro/makefile.mk                         |    1 +
 svx/source/unodialogs/textconversiondlgs/makefile.mk |    2 ++
 sw/util/makefile.mk                                  |    1 +
 wizards/prj/build.lst                                |    2 +-
 14 files changed, 27 insertions(+), 18 deletions(-)

Index: workspace.cmcfixes19.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.cmcfixes19.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes19.patch	23 Sep 2005 09:54:50 -0000	1.1
+++ workspace.cmcfixes19.patch	23 Sep 2005 12:33:54 -0000	1.2
@@ -146,17 +146,17 @@
 diff -u -p -u -r1.34 -r1.34.10.1
 --- openoffice.org.orig/scp2/source/ooo/makefile.mk	9 Sep 2005 01:39:55 -0000	1.34
 +++ openoffice.org/scp2/source/ooo/makefile.mk	23 Sep 2005 08:24:19 -0000	1.34.10.1
-@@ -135,6 +135,10 @@ SCPDEFS+=-DSYSTEM_PORTAUDIO
- SCPDEFS+=-DSYSTEM_MYSPELL
+@@ -118,6 +118,10 @@
+ SCPDEFS+=-DWITHOUT_BINFILTER
  .ENDIF
  
 +.IF "$(SYSTEM_XALAN)" == "YES"
 +SCPDEFS+=-DSYSTEM_XALAN
 +.ENDIF
 +
- SCPDEFS+=\
-     -DICU_MAJOR=$(ICU_MAJOR) \
-     -DICU_MINOR=$(ICU_MINOR) \
+ .IF "$(SYSTEM_STDLIBS)" == "YES"
+ SCPDEFS+=-DSYSTEM_STDLIBS
+ .ENDIF
 Index: addin/datefunc/makefile.mk
 ===================================================================
 RCS file: /cvs/sc/sc/addin/datefunc/makefile.mk,v