rpms/openoffice.org/devel openoffice.org.spec,1.1210,1.1211

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
jan's nonbootstrap merge


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- openoffice.org.spec	15 Jun 2007 10:00:06 -0000	1.1210
+++ openoffice.org.spec	16 Jun 2007 12:30:42 -0000	1.1211
@@ -1904,7 +1904,6 @@
 %{instdir}/program/syssh.uno.so
 %{instdir}/program/textinstream.uno.so
 %{instdir}/program/textoutstream.uno.so
-%{instdir}/program/typeconverter.uno.so
 %{instdir}/program/types.rdb
 %{instdir}/program/ucpexpand1.uno.so
 %{instdir}/program/ucptdoc1.uno.so
@@ -1915,7 +1914,6 @@
 %{instdir}/program/unorc
 %{instdir}/program/updatefeed.uno.so
 %{instdir}/program/uri-encode
-%{instdir}/program/uriproc.uno.so
 %{instdir}/program/uuresolver.uno.so
 %{instdir}/program/vbaevents*.uno.so
 %{instdir}/program/vclcanvas.uno.so
@@ -2200,7 +2198,7 @@
 %{instdir}/program/localebe1.uno.so
 %{instdir}/program/sysmgr1.uno.so
 %{instdir}/program/ucpgvfs1.uno.so
-#stocmerge ones
+#stocmerge bootstrap
 %{instdir}/program/implreg.uno.so
 %{instdir}/program/nestedreg.uno.so
 %{instdir}/program/regtypeprov.uno.so
@@ -2209,9 +2207,13 @@
 %{instdir}/program/shlibloader.uno.so
 %{instdir}/program/simplereg.uno.so
 %{instdir}/program/typemgr.uno.so
+#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
 
 %post core