rpms/openoffice.org/devel openoffice.org.spec, 1.355, 1.356 openoffice.org-1.9.121.gcc17828.stlport.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.121.gcc17828.stlport.patch 
Log Message:
nah, svx needs -fPIC


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- openoffice.org.spec	25 Jul 2005 13:47:58 -0000	1.355
+++ openoffice.org.spec	25 Jul 2005 16:45:27 -0000	1.356
@@ -67,7 +67,8 @@
 %define langpack_langs en-US
 %endif
 
-ExclusiveArch:  %{ix86} ppc
+#ExclusiveArch:  %{ix86} ppc
+ExclusiveArch:  %{ix86}
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
@@ -161,7 +162,6 @@
 Patch59: openoffice.org-1.9.118.forwarddecl.psprint.patch
 Patch60: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 Patch61: openoffice.org-1.9.120.rh158977.execshield.bridges.patch
-Patch62: openoffice.org-1.9.121.gcc17828.stlport.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -193,7 +193,7 @@
 # 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, libcups.so
+Requires: libbluecurve.so, libcrux-engine.so
 Requires: %{libgcj} >= 4.0.0
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
 Obsoletes: openoffice.org
@@ -807,7 +807,6 @@
 %patch59 -p1 -b .forwarddecl.psprint.patch
 # %patch60 -p1 -b .rhXXXXX.envcflags.solenv.patch
 %patch61 -p1 -b .rh158977.execshield.bridges.patch
-%patch62 -p1 -b .gcc17828.stlport.patch
 
 %if %{includeexternals}
 #start ludicrous workaround


--- openoffice.org-1.9.121.gcc17828.stlport.patch DELETED ---