rpms/openoffice.org/devel openoffice.org.spec,1.1214,1.1215

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30680

Modified Files:
	openoffice.org.spec 
Log Message:
revert the temp disable


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1214
retrieving revision 1.1215
diff -u -r1.1214 -r1.1215
--- openoffice.org.spec	19 Jun 2007 08:56:16 -0000	1.1214
+++ openoffice.org.spec	20 Jun 2007 07:52:45 -0000	1.1215
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 18
-%define rh_rpm_release 3.1
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1072,10 +1072,10 @@
 %patch73 -p1 -b .workspace.cmcfixes34.patch
 %patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
 %patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
-#%if %{linkopt}
-#%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
-#%patch77 -p0 -b .ooo77885.stoc.nonbootstrap.patch
-#%endif
+%if %{linkopt}
+%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
+%patch77 -p0 -b .ooo77885.stoc.nonbootstrap.patch
+%endif
 %patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
 %patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
 %patch80 -p1 -b .ooo78383.vcl.printxerror.patch
@@ -2191,7 +2191,6 @@
 %{instdir}/program/localebe1.uno.so
 %{instdir}/program/sysmgr1.uno.so
 %{instdir}/program/ucpgvfs1.uno.so
-%endif
 #stocmerge bootstrap
 %{instdir}/program/implreg.uno.so
 %{instdir}/program/nestedreg.uno.so
@@ -2204,11 +2203,11 @@
 #stocmerge nonbootstrap
 %{instdir}/program/typeconverter.uno.so
 %{instdir}/program/uriproc.uno.so
-#%else
-##stocmerge ones
-#%{instdir}/program/bootstrap.uno.so
-#%{instdir}/program/stocservices.uno.so
-#%endif
+%else
+#stocmerge ones
+%{instdir}/program/bootstrap.uno.so
+%{instdir}/program/stocservices.uno.so
+%endif
 
 %post core
 update-desktop-database -q %{_datadir}/applications