rpms/openoffice.org/devel openoffice.org-1.9.121.gcc17828.stlport.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.gcc17828.stlport.patch 
Log Message:
wrong one

openoffice.org-1.9.121.gcc17828.stlport.patch:
 inc/unxlngppc4.mk         |    0 
 solenv/inc/unxlngppc4.mk  |    2 +-
 stlport/STLport-4.5.patch |    8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.gcc17828.stlport.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.gcc17828.stlport.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.121.gcc17828.stlport.patch	25 Jul 2005 13:47:58 -0000	1.2
+++ openoffice.org-1.9.121.gcc17828.stlport.patch	25 Jul 2005 14:20:02 -0000	1.3
@@ -21,19 +21,19 @@
  ! 
  ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
  ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-Index: inc/unxlngppc.mk
+Index: inc/unxlngppc4.mk
 ===================================================================
-RCS file: /cvs/tools/solenv/inc/unxlngppc.mk,v
+RCS file: /cvs/tools/solenv/inc/unxlngppc4.mk,v
 retrieving revision 1.18
-diff -u -p -u -r1.18 unxlngppc.mk
---- openoffice.org.orig/solenv/inc/unxlngppc.mk	11 Jul 2005 15:31:42 -0000	1.18
-+++ openoffice.org/solenv/inc/unxlngppc.mk	25 Jul 2005 13:46:30 -0000
-@@ -110,7 +110,7 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions 
+diff -u -p -u -r1.18 unxlngppc4.mk
+--- openoffice.org.orig/solenv/inc/unxlngppc4.mk	11 Jul 2005 15:31:54 -0000	1.18
++++ openoffice.org/solenv/inc/unxlngppc4.mk	25 Jul 2005 14:18:52 -0000
+@@ -113,7 +113,7 @@ CFLAGSCXX+= -Wno-ctor-dtor-privacy
  
- CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS)
- CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ 
+ # Compiler flags for compiling static object in single threaded environment with graphical user interface
 -PICSWITCH:=-fPIC
 +PICSWITCH:=-fpic
- 
- #Note: the build is not consistent in that it links static librtaries
- # libraries into dynamic libraries in places, so use -fPIC throughout
+ CFLAGSOBJGUIST=$(PICSWITCH)
+ # Compiler flags for compiling static object in single threaded environment with character user interface
+ CFLAGSOBJCUIST=$(PICSWITCH)