rpms/openoffice.org/devel openoffice.org-1.9.82.ooo45628.noznow.patch, NONE, 1.1 openoffice.org-1.9.87.ooo43538.sfx2.patch, NONE, 1.1 openoffice.org.spec, 1.103, 1.104 openoffice.org-1.9.82.NONE.noznow.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 21 15:48:01 UTC 2005
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10869
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.82.ooo45628.noznow.patch
openoffice.org-1.9.87.ooo43538.sfx2.patch
Removed Files:
openoffice.org-1.9.82.NONE.noznow.patch
Log Message:
more changes
openoffice.org-1.9.82.ooo45628.noznow.patch:
desktop/util/makefile.mk | 0
sysui/desktop/util/makefile.mk | 5 ++++-
2 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE openoffice.org-1.9.82.ooo45628.noznow.patch ---
Index: desktop/util/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/util/makefile.mk,v
retrieving revision 1.6
diff -u -p -r1.6 makefile.mk
--- openoffice.org.orig/sysui/desktop/util/makefile.mk 21 Jan 2005 11:26:03 -0000 1.6
+++ openoffice.org/sysui/desktop/util/makefile.mk 19 Mar 2005 10:04:38 -0000
@@ -80,7 +80,10 @@ LINKFLAGS+=-z nodefs
.ENDIF # "$(OS)" == "SOLARIS"
# Disable lazy binding of symbols
-.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
+.IF "$(OS)" == "LINUX"
+LINKFLAGS+=-Wl,-z,now
+.ENDIF
+.IF "$(OS)" == "SOLARIS"
LINKFLAGS+=-z now
.ENDIF
openoffice.org-1.9.87.ooo43538.sfx2.patch:
unoctitm.cxx | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
--- NEW FILE openoffice.org-1.9.87.ooo43538.sfx2.patch ---
Index: source/control/unoctitm.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/control/unoctitm.cxx,v
retrieving revision 1.41
retrieving revision 1.41.54.1
diff -u -r1.41 -r1.41.54.1
--- openoffice.org.orig/sfx2/source/control/unoctitm.cxx 2 Feb 2005 14:02:04 -0000 1.41
+++ openoffice.org/sfx2/source/control/unoctitm.cxx 28 Feb 2005 14:21:02 -0000 1.41.54.1
@@ -954,23 +954,30 @@
::cppu::OInterfaceContainerHelper* pContnr = pDispatch->GetListeners().getContainer ( aDispatchURL.Complete );
if ( bNotify && pContnr )
{
- // Retrieve metric from pool to have correct sub ID when calling QueryValue
- USHORT nSubId( 0 );
- SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
+ ::com::sun::star::uno::Any aState;
+ if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) )
+ {
+ // Retrieve metric from pool to have correct sub ID when calling QueryValue
+ USHORT nSubId( 0 );
+ SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
- // retrieve the core metric
- // it's enough to check the objectshell, the only shell that does not use the pool of the document
- // is SfxViewFrame, but it hasn't any metric parameters
- // TODO/LATER: what about the FormShell? Does it use any metric data?! Perhaps it should use the Pool of the document!
- if ( pSlotServ && pDispatcher )
- eMapUnit = GetCoreMetric( pDispatcher->GetShell( pSlotServ->GetShellLevel() )->GetPool(), nSID );
+ // retrieve the core metric
+ // it's enough to check the objectshell, the only shell that does not use the pool of the document
+ // is SfxViewFrame, but it hasn't any metric parameters
+ // TODO/LATER: what about the FormShell? Does it use any metric data?! Perhaps it should use the Pool of the document!
+ if ( pSlotServ && pDispatcher )
+ {
+ SfxShell* pShell = pDispatcher->GetShell( pSlotServ->GetShellLevel() );
+ DBG_ASSERT( pShell, "Can't get core metric without shell!" );
+ if ( pShell )
+ eMapUnit = GetCoreMetric( pShell->GetPool(), nSID );
+ }
- if ( eMapUnit == SFX_MAPUNIT_TWIP )
- nSubId |= CONVERT_TWIPS;
+ if ( eMapUnit == SFX_MAPUNIT_TWIP )
+ nSubId |= CONVERT_TWIPS;
- ::com::sun::star::uno::Any aState;
- if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) )
- pState->QueryValue( aState, (BYTE)nSubId );
+ pState->QueryValue( aState, (BYTE)nSubId );
+ }
else if ( eState == SFX_ITEM_DONTCARE )
{
// Use special uno struct to transport don't care state
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- openoffice.org.spec 20 Mar 2005 21:55:13 -0000 1.103
+++ openoffice.org.spec 21 Mar 2005 15:47:55 -0000 1.104
@@ -2,7 +2,8 @@
%define gccver 3.4.3
%define gcjver 4.0.0
%define _unpackaged_files_terminate_build 0
-%define langpacks 1
+#%define langpacks 1
+%define langpacks 0
ExclusiveArch: %{ix86} ppc
Summary: OpenOffice.org comprehensive office suite.
@@ -37,7 +38,7 @@
Patch5: openoffice.org-1.9.75.ooo41904.singleton.patch
Patch6: openoffice.org-1.9.80.ooo43466.wmclass.patch
Patch7: workspace-gccfour.patch
-Patch8: openoffice.org-1.9.82.NONE.noznow.patch
+Patch8: openoffice.org-1.9.82.ooo45628.noznow.patch
Patch9: openoffice.org-1.9.83.ooo43995.wptypedetect.patch
Patch10: openoffice.org-1.9.84.ooo44843.sdcasting.patch
Patch11: openoffice.org-1.9.84.ooo44846.svxcasting.patch
@@ -52,6 +53,7 @@
Patch20: openoffice.org-1.9.87.NONE.wizards.broken.patch
Patch21: openoffice.org-1.9.87.warnnoterroronmissing.patch
Patch22: openoffice.org-1.9.87.NONE.sysui.parallel.patch
+Patch23: openoffice.org-1.9.87.ooo43538.sfx2.patch
%define instdir %{_libdir}/openoffice.org%{version}
@@ -162,6 +164,14 @@
%description xsltfilter
xsltfilter module for %{name}, provides additional docbook and xhtml export transforms.
+%package javafilter
+Summary: extra javafilter module for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description javafilter
+javafilter module for %{name}, provides additional aportisdoc, pocket excel and pocket word import filters.
+
%package testtools
Summary: testtools for %{name}
Group: Development/Libraries
@@ -182,6 +192,7 @@
%package langpack-ar
Summary: Arabic language pack for %{name}
Group: Applications/Productivity
+Requires: fonts-arabic
Requires: %{name}-core = %{epoch}:%{version}-%{release}
%description langpack-ar
@@ -305,6 +316,7 @@
Summary: Hebrew language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-hebrew
Obsoletes: openoffice.org-langpack-he
%description langpack-he_IL
@@ -314,6 +326,7 @@
Summary: Hindi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-hindi
Obsoletes: openoffice.org-langpack-hi-IN
%description langpack-hi_IN
@@ -340,6 +353,7 @@
Summary: Japanese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-japanese
Obsoletes: openoffice.org-langpack-ja
%description langpack-ja_JP
@@ -358,6 +372,7 @@
Summary: Korean language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-korean
Obsoletes: openoffice.org-langpack-ko
%description langpack-ko_KR
@@ -490,6 +505,7 @@
Summary: Simplified Chinese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-chinese
Obsoletes: openoffice.org-langpack-zh-CN
%description langpack-zh_CN
@@ -499,6 +515,7 @@
Summary: Traditional Chinese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-chinese
Obsoletes: openoffice.org-langpack-zh-TW
%description langpack-zh_TW
@@ -538,6 +555,7 @@
%patch20 -p1 -b .wizards.broken.patch
%patch21 -p1 -b .warnnoterroronmissing.patch
%patch22 -p1 -b .sysui.parallel.patch
+%patch23 -p1 -b .ooo43538.sfx2.patch
cd solenv/bin
tar xvzf %{SOURCE2} Archive-Zip-1.13/lib
cd ../..
@@ -1290,7 +1308,33 @@
%{instdir}/program/bridgefac.uno.so
%{instdir}/program/canvasfactory.uno.so
%{instdir}/program/cde-open-url
-%{instdir}/program/classes
+%dir %{instdir}/program/classes
+%{instdir}/program/classes/avmedia.jar
+%{instdir}/program/classes/bsh.jar
+%{instdir}/program/classes/classes.jar
+%{instdir}/program/classes/commonwizards.jar
+%{instdir}/program/classes/docbook.jar
+%{instdir}/program/classes/hsqldb.jar
+%{instdir}/program/classes/htmlsoff.jar
+%{instdir}/program/classes/java_uno.jar
+%{instdir}/program/classes/java_uno_accessbridge.jar
+%{instdir}/program/classes/juh.jar
+%{instdir}/program/classes/jurt.jar
+%{instdir}/program/classes/jut.jar
+%{instdir}/program/classes/officebean.jar
+%{instdir}/program/classes/ridl.jar
+%{instdir}/program/classes/sandbox.jar
+%{instdir}/program/classes/sdbc_hsqldb.jar
+%{instdir}/program/classes/unoil.jar
+%{instdir}/program/classes/xalan.jar
+%{instdir}/program/classes/xercesImpl.jar
+%{instdir}/program/classes/XFlatXml.jar
+%{instdir}/program/classes/xml-apis.jar
+%{instdir}/program/classes/XMergeBridge.jar
+%{instdir}/program/classes/xmerge.jar
+%{instdir}/program/classes/XSLTFilter.jar
+%{instdir}/program/classes/XSLTValidate.jar
+%{instdir}/program/classes/xt.jar
%{instdir}/program/cmdmail.uno.so
%{instdir}/program/configimport
%{instdir}/program/configimport.bin
@@ -1300,7 +1344,6 @@
%{instdir}/program/deployment680*.uno.so
%{instdir}/program/deploymentgui680*.uno.so
%{instdir}/program/dlgprov680*.uno.so
-%{instdir}/program/filter
%{instdir}/program/gnome-open-url
%{instdir}/program/gnome-open-url.bin
%{instdir}/program/i18npool.uno.so
@@ -1491,9 +1534,7 @@
%{instdir}/program/libxcr680*.so
%{instdir}/program/libxmlfa680*.so
%{instdir}/program/libxmlfd680*.so
-%{instdir}/program/libxmlsec-nss.so
-%{instdir}/program/libxmlsec.so
-%{instdir}/program/libxmlsecurity.so
+%{instdir}/program/libxmlsec*
%{instdir}/program/libxmx680*.so
%{instdir}/program/libxo680*.so
%{instdir}/program/libxof680*.so
@@ -2044,6 +2085,29 @@
%dir %{instdir}/share/xslt/export
%{instdir}/share/xslt/export/xhtml
+%files javafilter
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/program
+%dir %{instdir}/program/classes
+%{instdir}/program/classes/aportisdoc.jar
+%{instdir}/program/classes/pexcel.jar
+%{instdir}/program/classes/pocketword.jar
+%dir %{instdir}/share
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
+
%files testtools
%defattr(-,root,root)
%dir %{instdir}
@@ -2089,6 +2153,10 @@
- openoffice.org-1.9.87.NONE.wizards.broken.patch wizards build with gcj, but don't register
- reshuffle direct install to a simple warn not error on missing files, and hijack PKGFORMAT to
transport direct install flags
+- libxmlsec name changed
+- java-filter subpackage like upstream now that they build with gcj
+- backport openoffice.org-1.9.87.ooo43538.sfx2.patch for rh#151594#
+- add requires on appropiate fonts for some langpacks
* Tue Mar 15 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.85-1
- bump to latest version
--- openoffice.org-1.9.82.NONE.noznow.patch DELETED ---
More information about the fedora-cvs-commits
mailing list