rpms/openoffice.org/devel openoffice.org-1.9.121.gcc17828.stlport.patch, 1.1, 1.2 openoffice.org.spec, 1.354, 1.355

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

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

openoffice.org-1.9.121.gcc17828.stlport.patch:
 inc/unxlngppc.mk          |    0 
 solenv/inc/unxlngppc.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.121.gcc17828.stlport.patch	25 Jul 2005 13:05:59 -0000	1.1
+++ openoffice.org-1.9.121.gcc17828.stlport.patch	25 Jul 2005 13:47:58 -0000	1.2
@@ -21,3 +21,19 @@
  ! 
  ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
  ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+Index: inc/unxlngppc.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxlngppc.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 
+ 
+ CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS)
+ CFLAGSCXX+= -Wno-ctor-dtor-privacy
+-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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- openoffice.org.spec	25 Jul 2005 13:10:00 -0000	1.354
+++ openoffice.org.spec	25 Jul 2005 13:47:58 -0000	1.355
@@ -188,13 +188,12 @@
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
-Requires: libart_lgpl >= 2.3.11, zlib, freetype, cups, curl, libxml2, openldap
-Requires: gtk2, gnome-vfs2, mozilla-nss >= 1.7.5, neon >= 0.24
-Requires: startup-notification, libjpeg, bitstream-vera-fonts
+Requires: libart_lgpl >= 2.3.11, mozilla-nss >= 1.7.5, neon >= 0.24
+Requires: startup-notification, bitstream-vera-fonts
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
-Requires: libbluecurve.so, libcrux-engine.so
+Requires: libbluecurve.so, libcrux-engine.so, libcups.so
 Requires: %{libgcj} >= 4.0.0
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
 Obsoletes: openoffice.org
@@ -848,8 +847,6 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-#force picswitch for gcc#17828#
-export PICSWITCH=-fpic
 #force linker
 export LINK=$CXX
 #faster build