rpms/openoffice.org/devel openoffice.org.spec,1.429,1.430

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- openoffice.org.spec	30 Aug 2005 16:14:38 -0000	1.429
+++ openoffice.org.spec	31 Aug 2005 09:11:54 -0000	1.430
@@ -1,5 +1,5 @@
 %define ooo2ver 126
-%define ooo_rpm_release 2
+%define ooo_rpm_release 2.cmc
 %define build_fc4 0
 %define build_fc5 1
 
@@ -788,7 +788,7 @@
 %patch14 -p1 -b .ooo45725.lingucomponent.contribdict.patch
 %patch15 -p1 -b .warnnoterroronmissing.patch
 %patch16 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch
+#%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch
 %patch18 -p1 -b .ooo44027.pthreadchange.patch
 %patch19 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 %patch20 -p1 -b .ooo35641.noxfonts.vcl.patch