rpms/openoffice.org/devel openoffice.org.spec,1.1131,1.1132

Fri Mar 30 18:27:27 UTC 2007

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
extend the DSO combining further


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -r1.1131 -r1.1132

--- openoffice.org.spec	30 Mar 2007 14:39:51 -0000	1.1131
+++ openoffice.org.spec	30 Mar 2007 18:27:25 -0000	1.1132
@@ -1539,7 +1539,6 @@
 %{instdir}/program/acceptor.uno.so
 %{instdir}/program/addin
 %{instdir}/program/basprov680*.uno.so
-%{instdir}/program/behelper.uno.so
 %{instdir}/program/bootstraprc
 %{instdir}/program/bridgefac.uno.so
 %{instdir}/program/canvasfactory.uno.so
@@ -1577,23 +1576,19 @@
 %{instdir}/program/cmdmail.uno.so
 %{instdir}/program/configimport
 %{instdir}/program/configimport.bin
-%{instdir}/program/configmgr2.uno.so
 %{instdir}/program/configmgrrc
 %{instdir}/program/connector.uno.so
 %{instdir}/program/crash_report
 %{instdir}/program/deployment680*.uno.so
 %{instdir}/program/deploymentgui680*.uno.so
-%{instdir}/program/desktopbe1.uno.so
 %{instdir}/program/dlgprov680*.uno.so
 %{instdir}/program/fpicker.uno.so
 %{instdir}/program/fps_gnome.uno.so
 %{instdir}/program/fps_office.uno.so
-%{instdir}/program/fsstorage.uno.so
 %{instdir}/program/gengal*
 %{instdir}/program/gnome-open-url
 %{instdir}/program/gnome-open-url.bin
 %{instdir}/program/hatchwindowfactory.uno.so
-%{instdir}/program/i18npool.uno.so
 %{instdir}/program/i18nsearch.uno.so
 %{instdir}/program/implreg.uno.so
 %{instdir}/program/intro.bmp
@@ -1610,7 +1605,6 @@
 %{instdir}/program/libadabas2.so
 %{instdir}/program/libavmedia*.so
 %{instdir}/program/libbasctl680*.so
-%{instdir}/program/libbasegfx680*.so
 %{instdir}/program/libbf_frm680*.so
 %{instdir}/program/libbf_go680*.so
 %{instdir}/program/libbf_lng680*.so
@@ -1647,7 +1641,6 @@
 %{instdir}/program/libdeploymentmisc680*.so
 %{instdir}/program/libdict_ja.so
 %{instdir}/program/libdict_zh.so
-%{instdir}/program/libdtransX11680*.so
 %{instdir}/program/libeggtray680*.so
 %{instdir}/program/libembobj.so
 %{instdir}/program/libemboleobj.so
@@ -1679,7 +1672,6 @@
 %{instdir}/program/libiti680*.so
 %{instdir}/program/libofficebean.so
 %{instdir}/program/libfile680*.so
-%{instdir}/program/libfileacc.so
 %{instdir}/program/libfilterconfig1.so
 %{instdir}/program/libflat680*.so
 %{instdir}/program/libfrm680*.so
@@ -1687,8 +1679,6 @@
 %{instdir}/program/libhsqldb2.so
 %{instdir}/program/libhyphen680*.so
 %{instdir}/program/libi18nregexpgcc3.so
-%{instdir}/program/libi18nutilgcc3.so
-%{instdir}/program/libj680*_g.so
 %{instdir}/program/libjava_uno.so
 %{instdir}/program/libjdbc2.so
 %{instdir}/program/libjpipe.so
@@ -1710,14 +1700,12 @@
 %{instdir}/program/libodbc2.so
 %{instdir}/program/libodbcbase2.so
 %{instdir}/program/liboffacc680*.so
-%{instdir}/program/libpackage2.so
 %{instdir}/program/libpcr680*.so
 %{instdir}/program/libpdffilter680*.so
 %{instdir}/program/libpk680*.so
 %{instdir}/program/libpl680*.so
 %{instdir}/program/libpreload680*.so
 %{instdir}/program/libprotocolhandler680*.so
-%{instdir}/program/libpsp680*.so
 %{instdir}/program/libqstart_gtk680*.so
 %{instdir}/program/librecentfile.so
 %{instdir}/program/libreg.so
@@ -1741,7 +1729,6 @@
 %{instdir}/program/libsdui680*.so
 %{instdir}/program/libspa680*.so
 %{instdir}/program/libspell680*.so
-%{instdir}/program/libspl680*.so
 %{instdir}/program/libsrtrs1.so
 %{instdir}/program/libstore.so
 %{instdir}/program/libstore.so.3
@@ -1752,7 +1739,6 @@
 %{instdir}/program/libtextconversiondlgs680*.so
 %{instdir}/program/libtfu680*.so
 %{instdir}/program/libtvhlp1.so
-%{instdir}/program/libucb1.so
 %{instdir}/program/libucpchelp1.so
 %{instdir}/program/libucpdav1.so
 %{instdir}/program/libucpftp1.so
@@ -1771,7 +1757,6 @@
 %{instdir}/program/liburp_uno.so
 %{instdir}/program/libuui680*.so
 %{instdir}/program/libvclplug_*680*.so
-%{instdir}/program/libvos3gcc3.so
 %{instdir}/program/libxmlfa680*.so
 %{instdir}/program/libxmlfd680*.so
 %{instdir}/program/libxmx680*.so
@@ -1781,7 +1766,6 @@
 %{instdir}/program/libxsltdlg680*.so
 %{instdir}/program/libxsltfilter680*.so
 %{instdir}/program/libxstor.so
-%{instdir}/program/localebe1.uno.so
 %{instdir}/program/migrationoo2.uno.so
 %{instdir}/program/namingservice.uno.so
 %{instdir}/program/nestedreg.uno.so
@@ -1876,7 +1860,6 @@
 %{instdir}/program/stringresource680*.uno.so
 %{instdir}/program/sunjavaplugin.so
 %{instdir}/program/svtmisc.uno.so
-%{instdir}/program/sysmgr1.uno.so
 %{instdir}/program/syssh.uno.so
 %{instdir}/program/textinstream.uno.so
 %{instdir}/program/textoutstream.uno.so
@@ -2119,9 +2102,7 @@
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
 #gnome integration
-%{instdir}/program/gconfbe1.uno.so
 %{instdir}/program/gnome-set-default-application
-%{instdir}/program/ucpgvfs1.uno.so
 #icons and mime
 %{_datadir}/icons/*
 %{_datadir}/mime-info/*
@@ -2135,28 +2116,47 @@
 %{_datadir}/mimelnk/application/*extension*
 #linkopt libs
 %if ! %{linkopt}
+%{instdir}/program/behelper.uno.so
+%{instdir}/program/configmgr2.uno.so
+%{instdir}/program/desktopbe1.uno.so
+%{instdir}/program/fsstorage.uno.so
+%{instdir}/program/gconfbe1.uno.so
+%{instdir}/program/i18npool.uno.so
+%{instdir}/program/libbasegfx680*.so
 %{instdir}/program/libcomphelp4gcc3.so
-%{instdir}/program/libucbhelper3gcc3.so
-%{instdir}/program/libi18nisolang*.so
+%{instdir}/program/libdtransX11680*.so
+%{instdir}/program/libfileacc.so
 %{instdir}/program/libfwe680*.so
 %{instdir}/program/libfwi680*.so
 %{instdir}/program/libfwk680*.so
 %{instdir}/program/libfwl680*.so
 %{instdir}/program/libfwm680*.so
 %{instdir}/program/libgo680*.so
+%{instdir}/program/libi18nisolang*.so
+%{instdir}/program/libi18nutilgcc3.so
+%{instdir}/program/libj680*_g.so
+%{instdir}/program/libpackage2.so
+%{instdir}/program/libpsp680*.so
 %{instdir}/program/libsb680*.so
 %{instdir}/program/libso680*.so
 %{instdir}/program/libsfx680*.so
 %{instdir}/program/libsot680*.so
+%{instdir}/program/libspl680*.so
 %{instdir}/program/libsvl680*.so
 %{instdir}/program/libsvt680*.so
 %{instdir}/program/libtk680*.so
 %{instdir}/program/libtl680*.so
+%{instdir}/program/libucb1.so
+%{instdir}/program/libucbhelper3gcc3.so
 %{instdir}/program/libucpfile1.so
 %{instdir}/program/libutl680*.so
 %{instdir}/program/libvcl680*.so
+%{instdir}/program/libvos3gcc3.so
 %{instdir}/program/libxcr680*.so
 %{instdir}/program/libxo680*.so
+%{instdir}/program/localebe1.uno.so
+%{instdir}/program/sysmgr1.uno.so
+%{instdir}/program/ucpgvfs1.uno.so
 %endif
 
 %post core


