rpms/openoffice.org/devel workspace.systemagg.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-serv10490

Modified Files:
	workspace.systemagg.patch 
Log Message:
no need to have that merge prone section in the spec

workspace.systemagg.patch:
 canvas/prj/build.lst                 |    2 -
 canvas/source/tools/image.cxx        |   70 +++++++++++++++++------------------
 canvas/source/tools/image.hxx        |    2 -
 config_office/configure.in           |   19 +++++++++
 config_office/set_soenv.in           |    1 
 scp2/source/canvas/canvascommons.scp |    2 +
 scp2/source/canvas/makefile.mk       |    4 ++
 solenv/inc/libs.mk                   |    4 ++
 8 files changed, 67 insertions(+), 37 deletions(-)

Index: workspace.systemagg.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.systemagg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.systemagg.patch	13 Dec 2005 12:21:43 -0000	1.1
+++ workspace.systemagg.patch	13 Dec 2005 12:25:03 -0000	1.2
@@ -206,23 +206,6 @@
  PARFILES= canvascommons.par		\
            directxcanvas.par     \
            vclcanvas.par
-Index: config/ssrc680.ini
-===================================================================
-RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
-retrieving revision 1.83
-retrieving revision 1.83.48.1
-diff -u -r1.83 -r1.83.48.1
---- openoffice.org.orig/solenv/config/ssrc680.ini	28 Oct 2005 15:04:11 -0000	1.83
-+++ openoffice.org/solenv/config/ssrc680.ini	23 Nov 2005 11:23:02 -0000	1.83.48.1
-@@ -108,7 +108,7 @@
- 			BIG_SVX TRUE
- 			BIG_GOODIES TRUE
- 			BMP_WRITES_FLAG TRUE
--            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN
-+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG
- 			RES_ENUS TRUE
- 			RES_GER TRUE
- 			NO_REC_RES TRUE
 Index: inc/libs.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/libs.mk,v