rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.35, 1.1440.2.36

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Mar 27 09:17:16 UTC 2008


Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
and use an ure package now for the ure bits


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.35
retrieving revision 1.1440.2.36
diff -u -r1.1440.2.35 -r1.1440.2.36
--- openoffice.org.spec	27 Mar 2008 08:03:39 -0000	1.1440.2.35
+++ openoffice.org.spec	27 Mar 2008 09:16:15 -0000	1.1440.2.36
@@ -314,6 +314,19 @@
 %description testtools
 QA tools for %{name}, enables automated testing.
 
+%package ure
+Summary: UNO Runtime Environment
+Group: Development/Libraries
+Requires: unzip, java-devel
+
+%description ure
+UNO is the component model of %{name}. UNO offers interoperability between
+programming languages, other components models and hardware architectures,
+either in process or over process boundaries, in the Intranet as well as in the
+Internet. UNO components may be implemented in and accessed from any
+programming language for which a UNO implementation (AKA language binding) and
+an appropriate bridge or adapter exists
+
 %package sdk
 Summary: Software Development Kit for %{name}
 Group: Development/Libraries
@@ -1252,7 +1265,7 @@
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
             -e "s, at OO_SDK_HOME@,%{baseinstdir}/sdk," \
-            -e "s, at OFFICE_HOME@,%{baseinstdir}," \
+            -e "s, at OFFICE_HOME@,%{basisinstdir}," \
             -e "s, at OO_SDK_URE_HOME@,," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
             -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
@@ -1716,13 +1729,10 @@
 %{basisinstdir}/help/main_transform.xsl
 %{basisinstdir}/presets
 %dir %{basisinstdir}/program
-%{ureinstdir}/lib/JREProperties.class
 %{oooinstdir}/program/about.bmp
-%{ureinstdir}/lib/acceptor.uno.so
 %{basisinstdir}/program/addin
 %{basisinstdir}/program/basprov%{SOPOST}.uno.so
 %{oooinstdir}/program/bootstraprc
-%{ureinstdir}/lib/bridgefac.uno.so
 %{basisinstdir}/program/canvasfactory.uno.so
 %{basisinstdir}/program/cde-open-url
 %dir %{basisinstdir}/program/classes
@@ -1731,16 +1741,12 @@
 %{basisinstdir}/program/classes/commonwizards.jar
 %{basisinstdir}/program/classes/fax.jar
 %{basisinstdir}/program/classes/form.jar
-%{ureinstdir}/share/java/java_uno.jar
 %{basisinstdir}/program/classes/js.jar
-%{ureinstdir}/share/java/juh.jar          
-%{ureinstdir}/share/java/jurt.jar         
 %{basisinstdir}/program/classes/jut.jar          
 %{basisinstdir}/program/classes/query.jar          
 %{basisinstdir}/program/classes/letter.jar          
 %{basisinstdir}/program/classes/officebean.jar
 %{basisinstdir}/program/classes/report.jar
-%{ureinstdir}/share/java/ridl.jar
 %if ! %{jdk_is_gcj}
 %{basisinstdir}/program/classes/sandbox.jar
 %endif
@@ -1751,7 +1757,6 @@
 %{basisinstdir}/program/classes/ScriptProviderForJavaScript.jar
 %{basisinstdir}/program/classes/table.jar
 %{basisinstdir}/program/classes/unoil.jar
-%{ureinstdir}/share/java/unoloader.jar
 %{basisinstdir}/program/classes/web.jar
 %{basisinstdir}/program/classes/XMergeBridge.jar
 %{basisinstdir}/program/classes/xmerge.jar
@@ -1761,7 +1766,6 @@
 %{basisinstdir}/program/configimport
 %{basisinstdir}/program/configimport.bin
 %{basisinstdir}/program/configmgrrc
-%{ureinstdir}/lib/connector.uno.so
 %{oooinstdir}/program/crash_report
 %{basisinstdir}/program/deployment%{SOPOST}.uno.so
 %{basisinstdir}/program/deploymentgui%{SOPOST}.uno.so
@@ -1777,18 +1781,11 @@
 %{basisinstdir}/program/hatchwindowfactory.uno.so
 %{basisinstdir}/program/i18nsearch.uno.so
 %{oooinstdir}/program/intro.bmp
-%{ureinstdir}/lib/introspection.uno.so
-%{ureinstdir}/lib/invocadapt.uno.so
-%{ureinstdir}/lib/invocation.uno.so
-%{ureinstdir}/bin/javaldx
-%{ureinstdir}/lib/javaloader.uno.so
-%{ureinstdir}/lib/javavm.uno.so
 %{basisinstdir}/program/kde-open-url
 %{basisinstdir}/program/legacy_binfilters.rdb
 %{basisinstdir}/program/libabp%{SOPOST}.so
 %{basisinstdir}/program/libacc%{SOPOST}.so
 %{basisinstdir}/program/libadabas%{SOPOST}.so
-%{ureinstdir}/lib/libaffine_uno_uno.so
 %{basisinstdir}/program/libavmedia*.so
 %{basisinstdir}/program/libbasctl%{SOPOST}.so
 %{basisinstdir}/program/libbf_sb%{SOPOST}.so
@@ -1858,19 +1855,12 @@
 %{basisinstdir}/program/libfilterconfig1.so
 %{basisinstdir}/program/libflat%{SOPOST}.so
 %{basisinstdir}/program/libfrm%{SOPOST}.so
-%{ureinstdir}/lib/libgcc3_uno.so
 %{basisinstdir}/program/libguesslang%{SOPOST}.so
 %{basisinstdir}/program/libhelplinker%{SOPOST}.so
 %{basisinstdir}/program/libhsqldb2.so
 %{basisinstdir}/program/libhyphen%{SOPOST}.so
 %{basisinstdir}/program/libi18nregexpgcc3.so
-%{ureinstdir}/lib/libjava_uno.so
 %{basisinstdir}/program/libjdbc2.so
-%{ureinstdir}/lib/libjpipe.so
-%{ureinstdir}/lib/libjuh.so
-%{ureinstdir}/lib/libjuhx.so
-%{ureinstdir}/lib/libjvmaccessgcc3.so.3
-%{ureinstdir}/lib/libjvmfwk.so.3
 %{basisinstdir}/program/liblegacy_binfilters%{SOPOST}.so
 %{basisinstdir}/program/liblng%{SOPOST}.so
 %{basisinstdir}/program/liblog%{SOPOST}.so
@@ -1892,9 +1882,7 @@
 %{basisinstdir}/program/libprotocolhandler%{SOPOST}.so
 %{basisinstdir}/program/libqstart_gtk%{SOPOST}.so
 %{basisinstdir}/program/librecentfile.so
-%{ureinstdir}/lib/libreg.so.3
 %{basisinstdir}/program/libres%{SOPOST}.so
-%{ureinstdir}/lib/librmcxt.so.3
 %{basisinstdir}/program/libsax%{SOPOST}.so
 %{basisinstdir}/program/libscn%{SOPOST}.so
 %{basisinstdir}/program/libscriptframe.so
@@ -1906,7 +1894,6 @@
 %{basisinstdir}/program/libspa%{SOPOST}.so
 %{basisinstdir}/program/libspell%{SOPOST}.so
 %{basisinstdir}/program/libsrtrs1.so
-%{ureinstdir}/lib/libstore.so.3
 %{basisinstdir}/program/libsts%{SOPOST}.so
 %{basisinstdir}/program/libsvx%{SOPOST}.so
 %{basisinstdir}/program/libsw%{SOPOST}.so
@@ -1920,16 +1907,9 @@
 %{basisinstdir}/program/libucpftp1.so
 %{basisinstdir}/program/libucphier1.so
 %{basisinstdir}/program/libucppkg1.so
-%{ureinstdir}/lib/libuno_cppu.so.3
-%{ureinstdir}/lib/libuno_cppuhelpergcc3.so.3
-%{ureinstdir}/lib/libuno_purpenvhelpergcc3.so.3
-%{ureinstdir}/lib/libuno_sal.so.3
-%{ureinstdir}/lib/libuno_salhelpergcc3.so.3
 %{basisinstdir}/program/libunopkg.so
 %{basisinstdir}/program/libunoxml%{SOPOST}.so
-%{ureinstdir}/lib/libunsafe_uno_uno.so
 %{basisinstdir}/program/libupdchk%{SOPOST}.so
-%{ureinstdir}/lib/liburp_uno.so
 %{basisinstdir}/program/libuui%{SOPOST}.so
 %{basisinstdir}/program/libvclplug_gen%{SOPOST}.so
 %{basisinstdir}/program/libvclplug_gtk%{SOPOST}.so
@@ -1943,7 +1923,6 @@
 %{basisinstdir}/program/libxsltfilter%{SOPOST}.so
 %{basisinstdir}/program/libxstor.so
 %{basisinstdir}/program/migrationoo2.uno.so
-%{ureinstdir}/lib/namingservice.uno.so
 %{basisinstdir}/program/nsplugin
 %{basisinstdir}/program/open-url
 %{basisinstdir}/program/offapi.rdb
@@ -1951,9 +1930,6 @@
 %{basisinstdir}/program/plugin
 %{basisinstdir}/program/pluginapp.bin
 %{basisinstdir}/program/productregistration.uno.so
-%{ureinstdir}/lib/proxyfac.uno.so
-%{ureinstdir}/lib/reflection.uno.so
-%{ureinstdir}/lib/remotebridge.uno.so
 %dir %{basisinstdir}/program/resource
 %{basisinstdir}/program/resource/avmedia%{UPD}en-US.res
 %{basisinstdir}/program/resource/abp%{UPD}en-US.res
@@ -2029,25 +2005,17 @@
 %{oooinstdir}/program/sofficerc
 %{oooinstdir}/program/spadmin
 %{basisinstdir}/program/spadmin.bin
-%{ureinstdir}/lib/streams.uno.so
 %{basisinstdir}/program/stringresource%{SOPOST}.uno.so
-%{ureinstdir}/lib/sunjavaplugin.so
 %{basisinstdir}/program/svtmisc.uno.so
 %{basisinstdir}/program/syssh.uno.so
-%{ureinstdir}/lib/textinstream.uno.so
-%{ureinstdir}/lib/textoutstream.uno.so
-%{ureinstdir}/share/misc/services.rdb
-%{ureinstdir}/share/misc/types.rdb
 %{basisinstdir}/program/ucpexpand1.uno.so
 %{basisinstdir}/program/ucptdoc1.uno.so
-%{ureinstdir}/bin/uno.bin
 %{oooinstdir}/program/unopkg
 %{oooinstdir}/program/unopkg.bin
 %{basisinstdir}/program/unorc
 %{basisinstdir}/program/updatefeed.uno.so
 %{basisinstdir}/ure-link
 %{basisinstdir}/program/uri-encode
-%{ureinstdir}/lib/uuresolver.uno.so
 %{basisinstdir}/program/vclcanvas.uno.so
 %{basisinstdir}/program/cairocanvas.uno.so
 %{oooinstdir}/program/versionrc
@@ -2066,7 +2034,6 @@
 %{oooinstdir}/share/config/images_crystal.zip
 %{oooinstdir}/share/config/images_hicontrast.zip
 %{oooinstdir}/share/config/images_tango.zip
-%{ureinstdir}/share/misc/javavendors.xml
 %{basisinstdir}/share/config/javasettingsunopkginstall.xml
 %{basisinstdir}/share/config/psetup.xpm
 %{basisinstdir}/share/config/psetupl.xpm
@@ -2289,9 +2256,6 @@
 %{_datadir}/mime-info/*
 %{basisinstdir}/program/libxmlsecurity.so
 %{basisinstdir}/program/liboldxmlsec*
-%if %{stlport_abi_lockin}
-%{ureinstdir}/lib/libstlport*.so
-%endif
 %{_datadir}/applications/openoffice.org-extensionmgr.desktop
 %{_datadir}/mime/packages/openoffice.org.xml
 %{_datadir}/mimelnk/application/*extension*
@@ -2334,9 +2298,6 @@
 %{basisinstdir}/program/localebe1.uno.so
 %{basisinstdir}/program/sysmgr1.uno.so
 %{basisinstdir}/program/ucpgvfs1.uno.so
-#stocmerge ones
-%{ureinstdir}/lib/bootstrap.uno.so
-%{ureinstdir}/lib/stocservices.uno.so
 %{basisinstdir}/program/stocservices.uno.so
 #vba
 %{basisinstdir}/program/oovbaapi.rdb
@@ -2344,9 +2305,6 @@
 %{oooinstdir}/program/fundamentalrc
 %{oooinstdir}/program/redirectrc
 %{oooinstdir}/basis-link
-%{ureinstdir}/bin/regcomp.bin
-%{ureinstdir}/bin/regmerge
-%{ureinstdir}/bin/regview
 
 %post core
 update-desktop-database -q %{_datadir}/applications
@@ -2828,6 +2786,12 @@
 %dir %{basisinstdir}/program/resource
 %{basisinstdir}/program/resource/stt%{UPD}en-US.res
 
+%files ure
+%defattr(-,root,root,-)
+%dir %{baseinstdir}
+%{ureinstdir}
+%exclude %{ureinstdir}/lib/libsalalloc_malloc.so.3
+
 %files sdk
 %defattr(-,root,root,-)
 %{baseinstdir}/sdk/




More information about the fedora-extras-commits mailing list