rpms/openoffice.org/devel openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch, NONE, 1.1.2.1 openoffice.org.langpack-common.template, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.7, 1.1440.2.8 openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Mar 10 10:44:25 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3880
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org.langpack-common.template openoffice.org.spec
Added Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
Removed Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
Log Message:
new patterns
openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch:
--- NEW FILE openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.36
diff -u -r1.36 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx 6 Jul 2007 10:10:50 -0000 1.36
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx 10 Mar 2008 09:35:36 -0000
@@ -664,8 +664,8 @@
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
{
- ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
- aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+ ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+ ::rtl::OUString::valueOf( (sal_Int32)nInd );
if ( xNameContainer->hasByName( aStreamName ) )
xNameContainer->removeByName( aStreamName );
}
@@ -737,8 +737,8 @@
{
for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
{
- ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
- aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+ ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+ ::rtl::OUString::valueOf( (sal_Int32)nInd );
try
{
bExists = xNameContainer->hasByName( aStreamName );
@@ -787,8 +787,8 @@
{
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
{
- ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
- aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+ ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+ rtl::OUString::valueOf( (sal_Int32)nInd );
uno::Reference< io::XStream > xCachedCopyStream;
try
{
Index: openoffice.org.langpack-common.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-common.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org.langpack-common.template 19 Feb 2007 16:05:46 -0000 1.1
+++ openoffice.org.langpack-common.template 10 Mar 2008 10:43:49 -0000 1.1.2.1
@@ -2,7 +2,7 @@
%dir %{instdir}
%dir %{instdir}/program
%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680LANG.res
+%{instdir}/program/resource/*LANG.res
%dir %{instdir}/share
%dir %{instdir}/share/readme
%{instdir}/share/readme/LICENSE_LANG
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.7
retrieving revision 1.1440.2.8
diff -u -r1.1440.2.7 -r1.1440.2.8
--- openoffice.org.spec 9 Mar 2008 18:23:44 -0000 1.1440.2.7
+++ openoffice.org.spec 10 Mar 2008 10:43:49 -0000 1.1440.2.8
@@ -141,9 +141,12 @@
Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
Patch68: workspace.cmcfixes43.patch
Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
%define instdir %{_libdir}/openoffice.org
%define OFFICEUPD 300
+%define UPD
+%define SOPOST l*
%description
OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -1096,6 +1099,7 @@
%patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
%patch68 -p1 -b .workspace.cmcfixes43.patch
%patch69 -p1 -b .ooo86588.sw.buildfix.patch
+%patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1723,7 +1727,7 @@
%{instdir}/program/about.bmp
%{instdir}/program/acceptor.uno.so
%{instdir}/program/addin
-%{instdir}/program/basprov680*.uno.so
+%{instdir}/program/basprov%{SOPOST}.uno.so
%{instdir}/program/bootstraprc
%{instdir}/program/bridgefac.uno.so
%{instdir}/program/canvasfactory.uno.so
@@ -1766,9 +1770,9 @@
%{instdir}/program/configmgrrc
%{instdir}/program/connector.uno.so
%{instdir}/program/crash_report
-%{instdir}/program/deployment680*.uno.so
-%{instdir}/program/deploymentgui680*.uno.so
-%{instdir}/program/dlgprov680*.uno.so
+%{instdir}/program/deployment%{SOPOST}.uno.so
+%{instdir}/program/deploymentgui%{SOPOST}.uno.so
+%{instdir}/program/dlgprov%{SOPOST}.uno.so
%{instdir}/program/fpicker.uno.so
%{instdir}/program/fps_gnome.uno.so
%{instdir}/program/fps_office.uno.so
@@ -1787,89 +1791,89 @@
%{instdir}/program/jvmfwk3rc
%{instdir}/program/kde-open-url
%{instdir}/program/legacy_binfilters.rdb
-%{instdir}/program/libabp680*.so
-%{instdir}/program/libacc680*.so
+%{instdir}/program/libabp%{SOPOST}.so
+%{instdir}/program/libacc%{SOPOST}.so
%{instdir}/program/libadabas2.so
%{instdir}/program/libaffine_uno_uno.so
%{instdir}/program/libavmedia*.so
-%{instdir}/program/libbasctl680*.so
-%{instdir}/program/libbf_sb680*.so
-%{instdir}/program/libbf_frm680*.so
-%{instdir}/program/libbf_go680*.so
-%{instdir}/program/libbf_migratefilter680*.so
-%{instdir}/program/libbf_ofa680*.so
-%{instdir}/program/libbf_sch680*.so
-%{instdir}/program/libbf_sd680*.so
-%{instdir}/program/libbf_sm680*.so
-%{instdir}/program/libbf_so680*.so
-%{instdir}/program/libbf_svx680*.so
-%{instdir}/program/libbf_sw680*.so
-%{instdir}/program/libbf_wrapper680*.so
-%{instdir}/program/libbf_xo680*.so
-%{instdir}/program/libbib680*.so
-%{instdir}/program/libbindet680*.so
+%{instdir}/program/libbasctl%{SOPOST}.so
+%{instdir}/program/libbf_sb%{SOPOST}.so
+%{instdir}/program/libbf_frm%{SOPOST}.so
+%{instdir}/program/libbf_go%{SOPOST}.so
+%{instdir}/program/libbf_migratefilter%{SOPOST}.so
+%{instdir}/program/libbf_ofa%{SOPOST}.so
+%{instdir}/program/libbf_sch%{SOPOST}.so
+%{instdir}/program/libbf_sd%{SOPOST}.so
+%{instdir}/program/libbf_sm%{SOPOST}.so
+%{instdir}/program/libbf_so%{SOPOST}.so
+%{instdir}/program/libbf_svx%{SOPOST}.so
+%{instdir}/program/libbf_sw%{SOPOST}.so
+%{instdir}/program/libbf_wrapper%{SOPOST}.so
+%{instdir}/program/libbf_xo%{SOPOST}.so
+%{instdir}/program/libbib%{SOPOST}.so
+%{instdir}/program/libbindet%{SOPOST}.so
%{instdir}/program/libcached1.so
-%{instdir}/program/libcanvastools680*.so
-%{instdir}/program/libchart*680*.so
+%{instdir}/program/libcanvastools%{SOPOST}.so
+%{instdir}/program/libchart*%{SOPOST}.so
%{instdir}/program/libcollator_data.so
-%{instdir}/program/libcppcanvas680*.so
+%{instdir}/program/libcppcanvas%{SOPOST}.so
%{instdir}/program/libcppu.so
%{instdir}/program/libcppu.so.3
%{instdir}/program/libcppuhelper3gcc3.so
%{instdir}/program/libcppuhelpergcc3.so
%{instdir}/program/libcppuhelpergcc3.so.3
-%{instdir}/program/libctl680*.so
-%{instdir}/program/libcui680*.so
-%{instdir}/program/libdba680*.so
-%{instdir}/program/libdbacfg680*.so
-%{instdir}/program/libdbase680*.so
-%{instdir}/program/libdbaxml680*.so
-%{instdir}/program/libdbp680*.so
+%{instdir}/program/libctl%{SOPOST}.so
+%{instdir}/program/libcui%{SOPOST}.so
+%{instdir}/program/libdba%{SOPOST}.so
+%{instdir}/program/libdbacfg%{SOPOST}.so
+%{instdir}/program/libdbase%{SOPOST}.so
+%{instdir}/program/libdbaxml%{SOPOST}.so
+%{instdir}/program/libdbp%{SOPOST}.so
%{instdir}/program/libdbpool2.so
-%{instdir}/program/libdbtools680*.so
-%{instdir}/program/libdbu680*.so
-%{instdir}/program/libdeploymentmisc680*.so
+%{instdir}/program/libdbtools%{SOPOST}.so
+%{instdir}/program/libdbu%{SOPOST}.so
+%{instdir}/program/libdeploymentmisc%{SOPOST}.so
%{instdir}/program/libdict_ja.so
%{instdir}/program/libdict_zh.so
-%{instdir}/program/libeggtray680*.so
+%{instdir}/program/libeggtray%{SOPOST}.so
%{instdir}/program/libembobj.so
%{instdir}/program/libemboleobj.so
%{instdir}/program/libevoab*.so
%{instdir}/program/libevtatt.so
-%{instdir}/program/libegi680*.so
-%{instdir}/program/libeme680*.so
-%{instdir}/program/libemp680*.so
-%{instdir}/program/libepb680*.so
-%{instdir}/program/libepg680*.so
-%{instdir}/program/libepp680*.so
-%{instdir}/program/libeps680*.so
-%{instdir}/program/libept680*.so
-%{instdir}/program/libera680*.so
-%{instdir}/program/libeti680*.so
-%{instdir}/program/libexp680*.so
-%{instdir}/program/libicd680*.so
-%{instdir}/program/libicg680*.so
-%{instdir}/program/libidx680*.so
-%{instdir}/program/libime680*.so
+%{instdir}/program/libegi%{SOPOST}.so
+%{instdir}/program/libeme%{SOPOST}.so
+%{instdir}/program/libemp%{SOPOST}.so
+%{instdir}/program/libepb%{SOPOST}.so
+%{instdir}/program/libepg%{SOPOST}.so
+%{instdir}/program/libepp%{SOPOST}.so
+%{instdir}/program/libeps%{SOPOST}.so
+%{instdir}/program/libept%{SOPOST}.so
+%{instdir}/program/libera%{SOPOST}.so
+%{instdir}/program/libeti%{SOPOST}.so
+%{instdir}/program/libexp%{SOPOST}.so
+%{instdir}/program/libicd%{SOPOST}.so
+%{instdir}/program/libicg%{SOPOST}.so
+%{instdir}/program/libidx%{SOPOST}.so
+%{instdir}/program/libime%{SOPOST}.so
%{instdir}/program/libindex_data.so
-%{instdir}/program/libipb680*.so
-%{instdir}/program/libipd680*.so
-%{instdir}/program/libips680*.so
-%{instdir}/program/libipt680*.so
-%{instdir}/program/libipx680*.so
-%{instdir}/program/libira680*.so
-%{instdir}/program/libitg680*.so
-%{instdir}/program/libiti680*.so
+%{instdir}/program/libipb%{SOPOST}.so
+%{instdir}/program/libipd%{SOPOST}.so
+%{instdir}/program/libips%{SOPOST}.so
+%{instdir}/program/libipt%{SOPOST}.so
+%{instdir}/program/libipx%{SOPOST}.so
+%{instdir}/program/libira%{SOPOST}.so
+%{instdir}/program/libitg%{SOPOST}.so
+%{instdir}/program/libiti%{SOPOST}.so
%{instdir}/program/libofficebean.so
-%{instdir}/program/libfile680*.so
+%{instdir}/program/libfile%{SOPOST}.so
%{instdir}/program/libfilterconfig1.so
-%{instdir}/program/libflat680*.so
-%{instdir}/program/libfrm680*.so
+%{instdir}/program/libflat%{SOPOST}.so
+%{instdir}/program/libfrm%{SOPOST}.so
%{instdir}/program/libgcc3_uno.so
-%{instdir}/program/libguesslang680*.so
-%{instdir}/program/libhelplinker680*.so
+%{instdir}/program/libguesslang%{SOPOST}.so
+%{instdir}/program/libhelplinker%{SOPOST}.so
%{instdir}/program/libhsqldb2.so
-%{instdir}/program/libhyphen680*.so
+%{instdir}/program/libhyphen%{SOPOST}.so
%{instdir}/program/libi18nregexpgcc3.so
%{instdir}/program/libjava_uno.so
%{instdir}/program/libjdbc2.so
@@ -1880,9 +1884,9 @@
%{instdir}/program/libjvmaccessgcc3.so.3
%{instdir}/program/libjvmfwk.so
%{instdir}/program/libjvmfwk.so.3
-%{instdir}/program/liblegacy_binfilters680*.so
-%{instdir}/program/liblng680*.so
-%{instdir}/program/liblog680*.so
+%{instdir}/program/liblegacy_binfilters%{SOPOST}.so
+%{instdir}/program/liblng%{SOPOST}.so
+%{instdir}/program/liblog%{SOPOST}.so
%{instdir}/program/liblocaledata_en.so
%{instdir}/program/liblocaledata_es.so
%{instdir}/program/liblocaledata_euro.so
@@ -1892,17 +1896,17 @@
%{instdir}/program/libnpsoplugin.so
%{instdir}/program/libodbc2.so
%{instdir}/program/libodbcbase2.so
-%{instdir}/program/liboffacc680*.so
-%{instdir}/program/libpcr680*.so
-%{instdir}/program/libpdffilter680*.so
-%{instdir}/program/libpl680*.so
-%{instdir}/program/libpreload680*.so
-%{instdir}/program/libprotocolhandler680*.so
-%{instdir}/program/libqstart_gtk680*.so
+%{instdir}/program/liboffacc%{SOPOST}.so
+%{instdir}/program/libpcr%{SOPOST}.so
+%{instdir}/program/libpdffilter%{SOPOST}.so
+%{instdir}/program/libpl%{SOPOST}.so
+%{instdir}/program/libpreload%{SOPOST}.so
+%{instdir}/program/libprotocolhandler%{SOPOST}.so
+%{instdir}/program/libqstart_gtk%{SOPOST}.so
%{instdir}/program/librecentfile.so
%{instdir}/program/libreg.so
%{instdir}/program/libreg.so.3
-%{instdir}/program/libres680*.so
+%{instdir}/program/libres%{SOPOST}.so
%{instdir}/program/librmcxt.so
%{instdir}/program/librmcxt.so.3
%{instdir}/program/libsal.so
@@ -1910,24 +1914,24 @@
%{instdir}/program/libsalhelper3gcc3.so
%{instdir}/program/libsalhelpergcc3.so
%{instdir}/program/libsalhelpergcc3.so.3
-%{instdir}/program/libscn680*.so
+%{instdir}/program/libscn%{SOPOST}.so
%{instdir}/program/libscriptframe.so
-%{instdir}/program/libsd680*.so
+%{instdir}/program/libsd%{SOPOST}.so
%{instdir}/program/libsdbc2.so
-%{instdir}/program/libsdbt680*so
-%{instdir}/program/libsdd680*.so
-%{instdir}/program/libsdui680*.so
-%{instdir}/program/libspa680*.so
-%{instdir}/program/libspell680*.so
+%{instdir}/program/libsdbt%{SOPOST}so
+%{instdir}/program/libsdd%{SOPOST}.so
+%{instdir}/program/libsdui%{SOPOST}.so
+%{instdir}/program/libspa%{SOPOST}.so
+%{instdir}/program/libspell%{SOPOST}.so
%{instdir}/program/libsrtrs1.so
%{instdir}/program/libstore.so
%{instdir}/program/libstore.so.3
-%{instdir}/program/libsts680*.so
-%{instdir}/program/libsvx680*.so
-%{instdir}/program/libsw680*.so
+%{instdir}/program/libsts%{SOPOST}.so
+%{instdir}/program/libsvx%{SOPOST}.so
+%{instdir}/program/libsw%{SOPOST}.so
%{instdir}/program/libtextconv_dict.so
-%{instdir}/program/libtextconversiondlgs680*.so
-%{instdir}/program/libtfu680*.so
+%{instdir}/program/libtextconversiondlgs%{SOPOST}.so
+%{instdir}/program/libtfu%{SOPOST}.so
%{instdir}/program/libtvhlp1.so
%{instdir}/program/libucbhelper4gcc3.so
%{instdir}/program/libucpchelp1.so
@@ -1944,21 +1948,21 @@
%{instdir}/program/libuno_sal.so.3
%{instdir}/program/libuno_salhelpergcc3.so
%{instdir}/program/libuno_salhelpergcc3.so.3
-%{instdir}/program/libunoxml680*.so
+%{instdir}/program/libunoxml%{SOPOST}.so
%{instdir}/program/libunsafe_uno_uno.so
-%{instdir}/program/libupdchk680*.so
+%{instdir}/program/libupdchk%{SOPOST}.so
%{instdir}/program/liburp_uno.so
-%{instdir}/program/libuui680*.so
-%{instdir}/program/libvclplug_gen680*.so
-%{instdir}/program/libvclplug_gtk680*.so
-%{instdir}/program/libxmlfa680*.so
-%{instdir}/program/libxmlfd680*.so
-%{instdir}/program/libxmx680*.so
-%{instdir}/program/libxof680*.so
+%{instdir}/program/libuui%{SOPOST}.so
+%{instdir}/program/libvclplug_gen%{SOPOST}.so
+%{instdir}/program/libvclplug_gtk%{SOPOST}.so
+%{instdir}/program/libxmlfa%{SOPOST}.so
+%{instdir}/program/libxmlfd%{SOPOST}.so
+%{instdir}/program/libxmx%{SOPOST}.so
+%{instdir}/program/libxof%{SOPOST}.so
%{instdir}/program/libxsec_fw.so
%{instdir}/program/libxsec_xmlsec.so
-%{instdir}/program/libxsltdlg680*.so
-%{instdir}/program/libxsltfilter680*.so
+%{instdir}/program/libxsltdlg%{SOPOST}.so
+%{instdir}/program/libxsltfilter%{SOPOST}.so
%{instdir}/program/libxstor.so
%{instdir}/program/migrationoo2.uno.so
%{instdir}/program/namingservice.uno.so
@@ -1974,66 +1978,66 @@
%{instdir}/program/reflection.uno.so
%{instdir}/program/remotebridge.uno.so
%dir %{instdir}/program/resource
-%{instdir}/program/resource/avmedia680en-US.res
-%{instdir}/program/resource/abp680en-US.res
-%{instdir}/program/resource/acc680en-US.res
-%{instdir}/program/resource/basctl680en-US.res
-%{instdir}/program/resource/bf_frm680en-US.res
-%{instdir}/program/resource/bf_ofa680en-US.res
-%{instdir}/program/resource/bf_sch680en-US.res
-%{instdir}/program/resource/bf_sd680en-US.res
-%{instdir}/program/resource/bf_svx680en-US.res
-%{instdir}/program/resource/bf_sw680en-US.res
-%{instdir}/program/resource/bib680en-US.res
-%{instdir}/program/resource/cal680en-US.res
-%{instdir}/program/resource/chartcontroller680en-US.res
-%{instdir}/program/resource/dba680en-US.res
-%{instdir}/program/resource/dbp680en-US.res
-%{instdir}/program/resource/dbu680en-US.res
-%{instdir}/program/resource/dbw680en-US.res
-%{instdir}/program/resource/deployment680en-US.res
-%{instdir}/program/resource/deploymentgui680en-US.res
-%{instdir}/program/resource/dkt680en-US.res
-%{instdir}/program/resource/egi680en-US.res
-%{instdir}/program/resource/eme680en-US.res
-%{instdir}/program/resource/epb680en-US.res
-%{instdir}/program/resource/epg680en-US.res
-%{instdir}/program/resource/epp680en-US.res
-%{instdir}/program/resource/eps680en-US.res
-%{instdir}/program/resource/ept680en-US.res
-%{instdir}/program/resource/eur680en-US.res
-%{instdir}/program/resource/fps_office680en-US.res
-%{instdir}/program/resource/frm680en-US.res
-%{instdir}/program/resource/fwe680en-US.res
-%{instdir}/program/resource/gal680en-US.res
-%{instdir}/program/resource/imp680en-US.res
-%{instdir}/program/resource/ofa680en-US.res
-%{instdir}/program/resource/ooo680en-US.res
-%{instdir}/program/resource/pcr680en-US.res
-%{instdir}/program/resource/pdffilter680en-US.res
-%{instdir}/program/resource/preload680en-US.res
-%{instdir}/program/resource/productregistration680en-US.res
-%{instdir}/program/resource/san680en-US.res
-%{instdir}/program/resource/sb680en-US.res
-%{instdir}/program/resource/sd680en-US.res
-%{instdir}/program/resource/sdbcl680en-US.res
-%{instdir}/program/resource/sfx680en-US.res
-%{instdir}/program/resource/spa680en-US.res
-%{instdir}/program/resource/sdbt680en-US.res
-%{instdir}/program/resource/svs680en-US.res
-%{instdir}/program/resource/svt680en-US.res
-%{instdir}/program/resource/svx680en-US.res
-%{instdir}/program/resource/sw680en-US.res
-%{instdir}/program/resource/textconversiondlgs680en-US.res
-%{instdir}/program/resource/tfu680en-US.res
-%{instdir}/program/resource/tk680en-US.res
-%{instdir}/program/resource/tpl680en-US.res
-%{instdir}/program/resource/uui680en-US.res
-%{instdir}/program/resource/updchk680en-US.res
-%{instdir}/program/resource/vcl680en-US.res
-%{instdir}/program/resource/wzi680en-US.res
-%{instdir}/program/resource/xmlsec680en-US.res
-%{instdir}/program/resource/xsltdlg680en-US.res
+%{instdir}/program/resource/avmedia%{UPD}en-US.res
+%{instdir}/program/resource/abp%{UPD}en-US.res
+%{instdir}/program/resource/acc%{UPD}en-US.res
+%{instdir}/program/resource/basctl%{UPD}en-US.res
+%{instdir}/program/resource/bf_frm%{UPD}en-US.res
+%{instdir}/program/resource/bf_ofa%{UPD}en-US.res
+%{instdir}/program/resource/bf_sch%{UPD}en-US.res
+%{instdir}/program/resource/bf_sd%{UPD}en-US.res
+%{instdir}/program/resource/bf_svx%{UPD}en-US.res
+%{instdir}/program/resource/bf_sw%{UPD}en-US.res
+%{instdir}/program/resource/bib%{UPD}en-US.res
+%{instdir}/program/resource/cal%{UPD}en-US.res
+%{instdir}/program/resource/chartcontroller%{UPD}en-US.res
+%{instdir}/program/resource/dba%{UPD}en-US.res
+%{instdir}/program/resource/dbp%{UPD}en-US.res
+%{instdir}/program/resource/dbu%{UPD}en-US.res
+%{instdir}/program/resource/dbw%{UPD}en-US.res
+%{instdir}/program/resource/deployment%{UPD}en-US.res
+%{instdir}/program/resource/deploymentgui%{UPD}en-US.res
+%{instdir}/program/resource/dkt%{UPD}en-US.res
+%{instdir}/program/resource/egi%{UPD}en-US.res
+%{instdir}/program/resource/eme%{UPD}en-US.res
+%{instdir}/program/resource/epb%{UPD}en-US.res
+%{instdir}/program/resource/epg%{UPD}en-US.res
+%{instdir}/program/resource/epp%{UPD}en-US.res
+%{instdir}/program/resource/eps%{UPD}en-US.res
+%{instdir}/program/resource/ept%{UPD}en-US.res
+%{instdir}/program/resource/eur%{UPD}en-US.res
+%{instdir}/program/resource/fps_office%{UPD}en-US.res
+%{instdir}/program/resource/frm%{UPD}en-US.res
+%{instdir}/program/resource/fwe%{UPD}en-US.res
+%{instdir}/program/resource/gal%{UPD}en-US.res
+%{instdir}/program/resource/imp%{UPD}en-US.res
+%{instdir}/program/resource/ofa%{UPD}en-US.res
+%{instdir}/program/resource/ooo%{UPD}en-US.res
+%{instdir}/program/resource/pcr%{UPD}en-US.res
+%{instdir}/program/resource/pdffilter%{UPD}en-US.res
+%{instdir}/program/resource/preload%{UPD}en-US.res
+%{instdir}/program/resource/productregistration%{UPD}en-US.res
+%{instdir}/program/resource/san%{UPD}en-US.res
+%{instdir}/program/resource/sb%{UPD}en-US.res
+%{instdir}/program/resource/sd%{UPD}en-US.res
+%{instdir}/program/resource/sdbcl%{UPD}en-US.res
+%{instdir}/program/resource/sfx%{UPD}en-US.res
+%{instdir}/program/resource/spa%{UPD}en-US.res
+%{instdir}/program/resource/sdbt%{UPD}en-US.res
+%{instdir}/program/resource/svs%{UPD}en-US.res
+%{instdir}/program/resource/svt%{UPD}en-US.res
+%{instdir}/program/resource/svx%{UPD}en-US.res
+%{instdir}/program/resource/sw%{UPD}en-US.res
+%{instdir}/program/resource/textconversiondlgs%{UPD}en-US.res
+%{instdir}/program/resource/tfu%{UPD}en-US.res
+%{instdir}/program/resource/tk%{UPD}en-US.res
+%{instdir}/program/resource/tpl%{UPD}en-US.res
+%{instdir}/program/resource/uui%{UPD}en-US.res
+%{instdir}/program/resource/updchk%{UPD}en-US.res
+%{instdir}/program/resource/vcl%{UPD}en-US.res
+%{instdir}/program/resource/wzi%{UPD}en-US.res
+%{instdir}/program/resource/xmlsec%{UPD}en-US.res
+%{instdir}/program/resource/xsltdlg%{UPD}en-US.res
%{instdir}/program/sax.uno.so
%{instdir}/program/senddoc
%{instdir}/program/services.rdb
@@ -2048,7 +2052,7 @@
%{instdir}/program/spadmin
%{instdir}/program/spadmin.bin
%{instdir}/program/streams.uno.so
-%{instdir}/program/stringresource680*.uno.so
+%{instdir}/program/stringresource%{SOPOST}.uno.so
%{instdir}/program/sunjavaplugin.so
%{instdir}/program/svtmisc.uno.so
%{instdir}/program/syssh.uno.so
@@ -2292,7 +2296,7 @@
%{instdir}/share/xslt/import/spreadsheetml
%{instdir}/share/xslt/import/wordml
#spellchecking lib
-%{instdir}/program/liblnth680*.so
+%{instdir}/program/liblnth%{SOPOST}.so
#launchers
%{_bindir}/openoffice.org-1.9
%{_bindir}/openoffice.org-2.0
@@ -2319,36 +2323,36 @@
%{instdir}/program/fsstorage.uno.so
%{instdir}/program/gconfbe1.uno.so
%{instdir}/program/i18npool.uno.so
-%{instdir}/program/libbasegfx680*.so
+%{instdir}/program/libbasegfx%{SOPOST}.so
%{instdir}/program/libcomphelp4gcc3.so
-%{instdir}/program/libdtransX11680*.so
+%{instdir}/program/libdtransX11%{SOPOST}.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/libfwe%{SOPOST}.so
+%{instdir}/program/libfwi%{SOPOST}.so
+%{instdir}/program/libfwk%{SOPOST}.so
+%{instdir}/program/libfwl%{SOPOST}.so
+%{instdir}/program/libfwm%{SOPOST}.so
+%{instdir}/program/libgo%{SOPOST}.so
%{instdir}/program/libi18nisolang*.so
%{instdir}/program/libi18nutilgcc3.so
-%{instdir}/program/libj680*_g.so
+%{instdir}/program/libj%{SOPOST}_g.so
%{instdir}/program/libpackage2.so
-%{instdir}/program/libpsp680*.so
-%{instdir}/program/libsb680*.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/libpsp%{SOPOST}.so
+%{instdir}/program/libsb%{SOPOST}.so
+%{instdir}/program/libsfx%{SOPOST}.so
+%{instdir}/program/libsot%{SOPOST}.so
+%{instdir}/program/libspl%{SOPOST}.so
+%{instdir}/program/libsvl%{SOPOST}.so
+%{instdir}/program/libsvt%{SOPOST}.so
+%{instdir}/program/libtk%{SOPOST}.so
+%{instdir}/program/libtl%{SOPOST}.so
%{instdir}/program/libucb1.so
%{instdir}/program/libucpfile1.so
-%{instdir}/program/libutl680*.so
-%{instdir}/program/libvcl680*.so
+%{instdir}/program/libutl%{SOPOST}.so
+%{instdir}/program/libvcl%{SOPOST}.so
%{instdir}/program/libvos3gcc3.so
-%{instdir}/program/libxcr680*.so
-%{instdir}/program/libxo680*.so
+%{instdir}/program/libxcr%{SOPOST}.so
+%{instdir}/program/libxo%{SOPOST}.so
%{instdir}/program/localebe1.uno.so
%{instdir}/program/sysmgr1.uno.so
%{instdir}/program/ucpgvfs1.uno.so
@@ -2396,12 +2400,12 @@
%defattr(-,root,root,-)
%{instdir}/help/en/sdatabase.*
%{instdir}/program/sbase
-%{instdir}/program/librpt*680*.so
+%{instdir}/program/librpt*%{SOPOST}.so
%dir %{instdir}/program/resource
-%{instdir}/program/resource/cnr680en-US.res
-%{instdir}/program/resource/rpt680en-US.res
-%{instdir}/program/resource/rptui680en-US.res
-%{instdir}/program/resource/sdberr680en-US.res
+%{instdir}/program/resource/cnr%{UPD}en-US.res
+%{instdir}/program/resource/rpt%{UPD}en-US.res
+%{instdir}/program/resource/rptui%{UPD}en-US.res
+%{instdir}/program/resource/sdberr%{UPD}en-US.res
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/modules
%dir %{instdir}/share/registry/modules/org
@@ -2447,18 +2451,18 @@
%dir %{instdir}/help/en
%{instdir}/help/en/scalc.*
%dir %{instdir}/program
-%{instdir}/program/libanalysis680*.so
-%{instdir}/program/libbf_sc680*.so
-%{instdir}/program/libcalc680*.so
-%{instdir}/program/libdate680*.so
-%{instdir}/program/libsc680*.so
-%{instdir}/program/libscd680*.so
-%{instdir}/program/libscui680*.so
+%{instdir}/program/libanalysis%{SOPOST}.so
+%{instdir}/program/libbf_sc%{SOPOST}.so
+%{instdir}/program/libcalc%{SOPOST}.so
+%{instdir}/program/libdate%{SOPOST}.so
+%{instdir}/program/libsc%{SOPOST}.so
+%{instdir}/program/libscd%{SOPOST}.so
+%{instdir}/program/libscui%{SOPOST}.so
%dir %{instdir}/program/resource
-%{instdir}/program/resource/analysis680en-US.res
-%{instdir}/program/resource/bf_sc680en-US.res
-%{instdir}/program/resource/date680en-US.res
-%{instdir}/program/resource/sc680en-US.res
+%{instdir}/program/resource/analysis%{UPD}en-US.res
+%{instdir}/program/resource/bf_sc%{UPD}en-US.res
+%{instdir}/program/resource/date%{UPD}en-US.res
+%{instdir}/program/resource/sc%{UPD}en-US.res
%{instdir}/program/scalc
%{instdir}/program/scalc.bin
%dir %{instdir}/share
@@ -2494,7 +2498,7 @@
%{_datadir}/mimelnk/application/*spreadsheet*
%{_bindir}/oocalc
#vba
-%{instdir}/program/libvbaobj680*.uno.so
+%{instdir}/program/libvbaobj%{SOPOST}.uno.so
%post calc
update-desktop-database -q %{_datadir}/applications
@@ -2570,9 +2574,9 @@
%{instdir}/help/en/swriter.*
%dir %{instdir}/program
%{instdir}/program/libhwp.so
-%{instdir}/program/libswd680*.so
-%{instdir}/program/libswui680*.so
-%{instdir}/program/libwpft680*.so
+%{instdir}/program/libswd%{SOPOST}.so
+%{instdir}/program/libswui%{SOPOST}.so
+%{instdir}/program/libwpft%{SOPOST}.so
%{instdir}/program/swriter
%{instdir}/program/swriter.bin
%dir %{instdir}/share
@@ -2687,11 +2691,11 @@
%dir %{instdir}/help/en
%{instdir}/help/en/smath.*
%dir %{instdir}/program
-%{instdir}/program/libsm680*.so
-%{instdir}/program/libsmd680*.so
+%{instdir}/program/libsm%{SOPOST}.so
+%{instdir}/program/libsmd%{SOPOST}.so
%dir %{instdir}/program/resource
-%{instdir}/program/resource/bf_sm680en-US.res
-%{instdir}/program/resource/sm680en-US.res
+%{instdir}/program/resource/bf_sm%{UPD}en-US.res
+%{instdir}/program/resource/sm%{UPD}en-US.res
%{instdir}/program/smath
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/data
@@ -2734,8 +2738,8 @@
%defattr(-,root,root,-)
%dir %{instdir}
%dir %{instdir}/program
-%{instdir}/program/libflash680*.so
-%{instdir}/program/libsvgfilter680*.so
+%{instdir}/program/libflash%{SOPOST}.so
+%{instdir}/program/libsvgfilter%{SOPOST}.so
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/modules
%dir %{instdir}/share/registry/modules/org
@@ -2795,13 +2799,13 @@
%dir %{instdir}
%dir %{instdir}/program
%{instdir}/program/hid.lst
-%{instdir}/program/libcommuni680*.so
+%{instdir}/program/libcommuni%{SOPOST}.so
%{instdir}/program/libsalalloc_malloc.so.3
-%{instdir}/program/libsimplecm680*.so
+%{instdir}/program/libsimplecm%{SOPOST}.so
%{instdir}/program/testtoolrc
%{instdir}/program/testtool.bin
%dir %{instdir}/program/resource
-%{instdir}/program/resource/stt680en-US.res
+%{instdir}/program/resource/stt%{UPD}en-US.res
%files sdk
%defattr(-,root,root,-)
@@ -2837,8 +2841,8 @@
%defattr(-,root,root,-)
%dir %{instdir}
%dir %{instdir}/program
-%{instdir}/program/libbasebmp680*.so
-%{instdir}/program/libvclplug_svp680*.so
+%{instdir}/program/libbasebmp%{SOPOST}.so
+%{instdir}/program/libvclplug_svp%{SOPOST}.so
%files pyuno
%defattr(-,root,root,-)
@@ -2879,6 +2883,8 @@
* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
- next release candidate
- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
* Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
- next release candidate
--- openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch DELETED ---
More information about the fedora-extras-commits
mailing list