rpms/openoffice.org/devel workspace.vcl97.patch, NONE, 1.1 openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch, 1.1, 1.2 openoffice.org.spec, 1.1720, 1.1721 workspace.transogl03.patch, 1.1, 1.2
Caolan McNamara
caolanm at fedoraproject.org
Thu Dec 11 09:50:43 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7689
Modified Files:
openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
openoffice.org.spec workspace.transogl03.patch
Added Files:
workspace.vcl97.patch
Log Message:
Resolves: rhbz#475795 same fallbacks for printing as screen
workspace.vcl97.patch:
--- NEW FILE workspace.vcl97.patch ---
Index: unx/source/gdi/pspgraphics.cxx
===================================================================
--- openoffice.org.orig/psprint/unx/source/gdi/pspgraphics.cxx (revision 265133)
+++ openoffice.org/psprint/unx/source/gdi/pspgraphics.cxx (working copy)
@@ -835,6 +835,8 @@
return false;
}
+void RegisterFontSubstitutors( ImplDevFontList* );
+
void PspGraphics::GetDevFontList( ImplDevFontList *pList )
{
::std::list< psp::fontID > aList;
@@ -846,6 +848,10 @@
for (it = aList.begin(); it != aList.end(); ++it)
if (rMgr.getFontFastInfo (*it, aInfo))
AnnounceFonts( pList, aInfo );
+
+ // register platform specific font substitutions if available
+ if( rMgr.hasFontconfig() )
+ RegisterFontSubstitutors( pList );
}
void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
Index: unx/source/gdi/salgdi3.cxx
===================================================================
--- unx/source/gdi/salgdi3.cxx (revision 265133)
+++ unx/source/gdi/salgdi3.cxx (working copy)
@@ -1545,7 +1545,7 @@
// ----------------------------------------------------------------------------
-static void RegisterFontSubstitutors( ImplDevFontList* );
+void RegisterFontSubstitutors( ImplDevFontList* );
void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
{
@@ -1806,7 +1806,7 @@
bool FindFontSubstitute( ImplFontSelectData&, OUString& rMissingCodes ) const;
};
-static void RegisterFontSubstitutors( ImplDevFontList* pList )
+void RegisterFontSubstitutors( ImplDevFontList* pList )
{
bool bDisableFC = false;
#ifdef SOLARIS
openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch:
Index: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch 10 Dec 2008 09:21:25 -0000 1.1
+++ openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch 11 Dec 2008 09:50:42 -0000 1.2
@@ -1,6 +1,6 @@
---- openoffice.org.orig/sd/sd/uiconfig/simpress/accelerator/default.xml 2008-12-10 09:10:53.000000000 +0000
-+++ openoffice.org/sd/sd/uiconfig/simpress/accelerator/default.xml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,142 +0,0 @@
+--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/default.xml 2008-12-10 09:10:53.000000000 +0000
++++ openoffice.org/sd/uiconfig/simpress/accelerator/default.xml 1970-01-01 01:00:00.000000000 +0100
+@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
- <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
@@ -72,79 +72,8 @@
- <accel:item accel:code="KEY_LEFT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineLeft"/>
- <accel:item accel:code="KEY_RIGHT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineRight"/>
-</accel:acceleratorlist>
--<?xml version="1.0" encoding="UTF-8"?>
--<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-- <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-- <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-- <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-- <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-- <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
-- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
-- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-- <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
-- <accel:item accel:code="KEY_UNDO" xlink:href=".uno:Undo"/>
-- <accel:item accel:code="KEY_REPEAT" xlink:href=".uno:Repeat"/>
-- <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-- <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-- <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-- <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-- <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-- <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-- <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-- <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-- <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-- <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-- <accel:item accel:code="KEY_F2" xlink:href=".uno:Text"/>
-- <accel:item accel:code="KEY_I" accel:mod1="true" xlink:href=".uno:Italic"/>
-- <accel:item accel:code="KEY_B" accel:mod1="true" xlink:href=".uno:Bold"/>
-- <accel:item accel:code="KEY_U" accel:mod1="true" xlink:href=".uno:Underline"/>
-- <accel:item accel:code="KEY_L" accel:mod1="true" xlink:href=".uno:LeftPara"/>
-- <accel:item accel:code="KEY_R" accel:mod1="true" xlink:href=".uno:RightPara"/>
-- <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:CenterPara"/>
-- <accel:item accel:code="KEY_J" accel:mod1="true" xlink:href=".uno:JustifyPara"/>
-- <accel:item accel:code="KEY_1" accel:mod1="true" xlink:href=".uno:SpacePara1"/>
-- <accel:item accel:code="KEY_5" accel:mod1="true" xlink:href=".uno:SpacePara15"/>
-- <accel:item accel:code="KEY_2" accel:mod1="true" xlink:href=".uno:SpacePara2"/>
-- <accel:item accel:code="KEY_F4" xlink:href=".uno:TransformDialog"/>
-- <accel:item accel:code="KEY_F8" xlink:href=".uno:ToggleObjectBezierMode"/>
-- <accel:item accel:code="KEY_F7" xlink:href=".uno:SpellDialog"/>
-- <accel:item accel:code="KEY_F7" accel:mod1="true" xlink:href=".uno:Thesaurus"/>
-- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:BringToFront"/>
-- <accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
-- <accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
-- <accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-- <accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
-- <accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:RestoreEditingView"/>
-- <accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
-- <accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
-- <accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
-- <accel:item accel:code="KEY_F8" accel:shift="true" accel:mod1="true" xlink:href=".uno:TextFitToSize"/>
-- <accel:item accel:code="KEY_G" accel:shift="true" accel:mod1="true" xlink:href=".uno:FormatGroup"/>
-- <accel:item accel:code="KEY_G" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:FormatUngroup"/>
-- <accel:item accel:code="KEY_9" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:ShowItemBrowser"/>
-- <accel:item accel:code="KEY_V" accel:shift="true" accel:mod1="true" xlink:href=".uno:PasteClipboard"/>
-- <accel:item accel:code="KEY_F3" accel:shift="true" xlink:href=".uno:CopyObjects"/>
-- <accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:PixelMode"/>
-- <accel:item accel:code="KEY_K" accel:shift="true" accel:mod1="true" xlink:href=".uno:Combine"/>
-- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:Forward"/>
-- <accel:item accel:code="KEY_SUBTRACT" accel:mod1="true" xlink:href=".uno:Backward"/>
-- <accel:item accel:code="KEY_A" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:AnimationMode"/>
-- <accel:item accel:code="KEY_K" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:Dismantle"/>
-- <accel:item accel:code="KEY_F3" xlink:href=".uno:EnterGroup"/>
-- <accel:item accel:code="KEY_F3" accel:mod1="true" xlink:href=".uno:LeaveGroup"/>
-- <accel:item accel:code="KEY_M" accel:mod1="true" xlink:href=".uno:ResetAttributes"/>
-- <accel:item accel:code="KEY_SPACE" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertNonBreakingSpace"/>
-- <accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
-- <accel:item accel:code="KEY_UP" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineUp"/>
-- <accel:item accel:code="KEY_DOWN" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineDown"/>
-- <accel:item accel:code="KEY_LEFT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineLeft"/>
-- <accel:item accel:code="KEY_RIGHT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineRight"/>
--</accel:acceleratorlist>
---- openoffice.org.orig/sd/sd/uiconfig/simpress/accelerator/en-US/default.xml 1970-01-01 01:00:00.000000000 +0100
-+++ openoffice.org/sd/sd/uiconfig/simpress/accelerator/en-US/default.xml 2008-12-10 09:11:17.000000000 +0000
+--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-US/default.xml 1970-01-01 01:00:00.000000000 +0100
++++ openoffice.org/sd/uiconfig/simpress/accelerator/en-US/default.xml 2008-12-10 09:11:17.000000000 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -r1.1720 -r1.1721
--- openoffice.org.spec 10 Dec 2008 14:13:16 -0000 1.1720
+++ openoffice.org.spec 11 Dec 2008 09:50:42 -0000 1.1721
@@ -131,6 +131,7 @@
Patch58: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
Patch59: openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
Patch60: workspace.transogl03.patch
+Patch61: workspace.vcl97.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -165,12 +166,12 @@
Requires: hunspell-en, hyphen-en
Requires: saxon, lucene
PreReq: gtk2 >= 2.9.4
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org-libs
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-kde
-Obsoletes: openoffice.org-langpack-eo
-Obsoletes: openoffice.org2-core
+Obsoletes: openoffice.org < 1.9.0
+Obsoletes: openoffice.org-libs < 1.9.0
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-kde < 1.9.0
+Obsoletes: openoffice.org-langpack-eo < 1:2.0.0
+Obsoletes: openoffice.org2-core < 1:3.0.0
%description core
The shared core libraries and support files for %{name}.
@@ -195,7 +196,7 @@
%package pyuno
Summary: Python support for %{name}
Group: Development/Libraries
-Obsoletes: openoffice.org2-pyuno
+Obsoletes: openoffice.org2-pyuno < 1:3.0.0
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: python
Requires(pre): openoffice.org-core
@@ -220,7 +221,7 @@
%package base
Summary: Database frontend for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org2-base
+Obsoletes: openoffice.org2-base < 1:3.0.0
Requires: %{name}-brand = %{epoch}:%{version}-%{release}
Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
@@ -362,8 +363,8 @@
%package writer
Summary: Word Processor module for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org2-writer
+Obsoletes: openoffice.org < 1.9.0
+Obsoletes: openoffice.org2-writer < 1:3.0.0
Requires: %{name}-brand = %{epoch}:%{version}-%{release}
Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
@@ -382,7 +383,7 @@
%package emailmerge
Summary: Email mail merge component for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org2-emailmerge
+Obsoletes: openoffice.org2-emailmerge < 1:3.0.0
Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
@@ -427,8 +428,8 @@
%package draw
Summary: Drawing module for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org2-draw
+Obsoletes: openoffice.org < 1.9.0
+Obsoletes: openoffice.org2-draw < 1:3.0.0
Requires: %{name}-draw-core = %{epoch}:%{version}-%{release}
Requires: %{name}-brand = %{epoch}:%{version}-%{release}
Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
@@ -457,8 +458,8 @@
%package impress
Summary: Presentation module for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org2-impress
+Obsoletes: openoffice.org < 1.9.0
+Obsoletes: openoffice.org2-impress < 1:3.0.0
Requires: %{name}-brand = %{epoch}:%{version}-%{release}
Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
@@ -487,8 +488,8 @@
%package math
Summary: Equation editor module for %{name}
Group: Applications/Productivity
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org2-math
+Obsoletes: openoffice.org < 1.9.0
+Obsoletes: openoffice.org2-math < 1:3.0.0
Requires: %{name}-brand = %{epoch}:%{version}-%{release}
Requires: %{name}-math-core = %{epoch}:%{version}-%{release}
@@ -508,7 +509,7 @@
Summary: Extra graphic filters for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org2-graphicfilter
+Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
%description graphicfilter
The graphicfilter module for %{name}, provides additional svg and flash export
@@ -518,7 +519,7 @@
Summary: Extra xsltfilter module for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org2-xsltfilter
+Obsoletes: openoffice.org2-xsltfilter < 1:3.0.0
%description xsltfilter
The xsltfilter module for %{name}, provides additional docbook and
@@ -528,7 +529,7 @@
Summary: Extra javafilter module for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org2-javafilter
+Obsoletes: openoffice.org2-javafilter < 1:3.0.0
%description javafilter
The javafilter module for %{name}, provides additional aportisdoc, pocket excel
@@ -537,7 +538,7 @@
%package testtools
Summary: Testtools for %{name}
Group: Development/Libraries
-Obsoletes: openoffice.org2-testtools
+Obsoletes: openoffice.org2-testtools < 1:3.0.0
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-writer = %{epoch}:%{version}-%{release}
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
@@ -611,9 +612,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-af, hyphen-af
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-af
-Obsoletes: openoffice.org2-langpack-af_ZA
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-af < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-af_ZA < 1:3.0.0
%description langpack-af_ZA
Provides additional afrikaans translations and resources for %{name}.
@@ -623,8 +624,8 @@
Group: Applications/Productivity
Requires: hunspell-ar
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ar
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-ar < 1:3.0.0
%description langpack-ar
Provides additional arabic translations and resources for %{name}.
@@ -634,9 +635,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-bg
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-bg
-Obsoletes: openoffice.org2-langpack-bg_BG
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-bg < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-bg_BG < 1:3.0.0
%description langpack-bg_BG
Provides additional bulgarian translations and resources for %{name}.
@@ -647,9 +648,9 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: lohit-fonts-bengali
Requires: hunspell-bn
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-bn_IN
-Obsoletes: openoffice.org2-langpack-bn
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-bn_IN < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-bn < 1:3.0.0
%description langpack-bn
Provides additional bengali translations and resources for %{name}.
@@ -659,9 +660,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ca
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-ca
-Obsoletes: openoffice.org2-langpack-ca_ES
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-ca < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-ca_ES < 1:3.0.0
%description langpack-ca_ES
Provides additional catalan translations and resources for %{name}.
@@ -671,9 +672,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-cs, hyphen-cs, mythes-cs
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-cs
-Obsoletes: openoffice.org2-langpack-cs_CZ
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-cs < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-cs_CZ < 1:3.0.0
%description langpack-cs_CZ
Provides additional czech translations and resources for %{name}.
@@ -683,9 +684,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-cy
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-cy
-Obsoletes: openoffice.org2-langpack-cy_GB
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-cy < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-cy_GB < 1:3.0.0
%description langpack-cy_GB
@@ -696,9 +697,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-da, hyphen-da
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-da
-Obsoletes: openoffice.org2-langpack-da_DK
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-da < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-da_DK < 1:3.0.0
%description langpack-da_DK
@@ -709,8 +710,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-de, hyphen-de, mythes-de
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-de
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-de < 1:3.0.0
%description langpack-de
@@ -721,9 +722,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-el
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org-langpack-el
-Obsoletes: openoffice.org2-langpack-el_GR
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-el < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-el_GR < 1:3.0.0
%description langpack-el_GR
@@ -743,8 +744,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-es
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-es
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-es < 1:3.0.0
%description langpack-es
Provides additional spanish translations and resources for %{name}.
@@ -754,9 +755,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ee, hyphen-et
-Obsoletes: openoffice.org-langpack-et
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-et_EE
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-et < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-et_EE < 1:3.0.0
%description langpack-et_EE
Provides additional estonian translations and resources for %{name}.
@@ -766,9 +767,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-eu
-Obsoletes: openoffice.org-langpack-eu
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-eu_ES
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-eu < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-eu_ES < 1:3.0.0
%description langpack-eu_ES
Provides additional basque translations and resources for %{name}.
@@ -777,9 +778,9 @@
Summary: Finnish language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org-langpack-fi
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-fi_FI
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-fi < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-fi_FI < 1:3.0.0
%description langpack-fi_FI
Provides additional finish translations and resources for %{name}.
@@ -789,8 +790,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-fr
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-fr
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-fr < 1:3.0.0
%description langpack-fr
Provides additional french translations and resources for %{name}.
@@ -800,7 +801,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ga, hyphen-ga
-Obsoletes: openoffice.org2-langpack-ga_IE
+Obsoletes: openoffice.org2-langpack-ga_IE < 1:3.0.0
%description langpack-ga_IE
Provides additional irish translations and resources for %{name}.
@@ -810,9 +811,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-gl
-Obsoletes: openoffice.org-langpack-gl
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-gl_ES
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-gl < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-gl_ES < 1:3.0.0
%description langpack-gl_ES
Provides additional galician translations and resources for %{name}.
@@ -823,8 +824,8 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-gu
Requires: lohit-fonts-gujarati
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-gu_IN
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-gu_IN < 1:3.0.0
%description langpack-gu_IN
Provides additional gujarati translations and resources for %{name}.
@@ -835,8 +836,8 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-pa
Requires: lohit-fonts-punjabi
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-pa_IN
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-pa_IN < 1:3.0.0
%description langpack-pa_IN
Provides additional punjabi translations and resources for %{name}.
@@ -847,9 +848,9 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-he
Requires: culmus-fonts
-Obsoletes: openoffice.org-langpack-he
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-he_IL
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-he < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-he_IL < 1:3.0.0
%description langpack-he_IL
Provides additional hebrew translations and resources for %{name}.
@@ -860,9 +861,9 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-hi
Requires: lohit-fonts-hindi
-Obsoletes: openoffice.org-langpack-hi-IN
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-hi_IN
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-hi-IN < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-hi_IN < 1:3.0.0
%description langpack-hi_IN
Provides additional hindi translations and resources for %{name}.
@@ -872,9 +873,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-hu, hyphen-hu
-Obsoletes: openoffice.org-langpack-hu
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-hu_HU
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-hu < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-hu_HU < 1:3.0.0
%description langpack-hu_HU
Provides additional hungarian translations and resources for %{name}.
@@ -884,9 +885,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-hr, hyphen-hr
-Obsoletes: openoffice.org-langpack-hr
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-hr_HR
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-hr < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-hr_HR < 1:3.0.0
%description langpack-hr_HR
Provides additional croatian translations and resources for %{name}.
@@ -896,8 +897,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-it, hyphen-it
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-it
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-it < 1:3.0.0
%description langpack-it
Provides additional italian translations and resources for %{name}.
@@ -907,9 +908,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: VLGothic-fonts
-Obsoletes: openoffice.org-langpack-ja
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ja_JP
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-ja < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-ja_JP < 1:3.0.0
%description langpack-ja_JP
Provides additional japanese translations and resources for %{name}.
@@ -919,9 +920,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: baekmuk-ttf-fonts-gulim
-Obsoletes: openoffice.org-langpack-ko
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ko_KR
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-ko < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-ko_KR < 1:3.0.0
%description langpack-ko_KR
Provides additional korean translations and resources for %{name}.
@@ -931,9 +932,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-lt, hyphen-lt
-Obsoletes: openoffice.org-langpack-lt
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-lt_LT
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-lt < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-lt_LT < 1:3.0.0
%description langpack-lt_LT
Provides additional lithuanian translations and resources for %{name}.
@@ -943,9 +944,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ms
-Obsoletes: openoffice.org-langpack-ms
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ms_MY
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-ms < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-ms_MY < 1:3.0.0
%description langpack-ms_MY
Provides additional malay translations and resources for %{name}.
@@ -955,9 +956,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-nb, hyphen-nb, mythes-nb
-Obsoletes: openoffice.org-langpack-nb
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-nb_NO
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-nb < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-nb_NO < 1:3.0.0
%description langpack-nb_NO
Provides additional bokmal translations and resources for %{name}.
@@ -967,8 +968,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-nl, hyphen-nl
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-nl
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-nl < 1:3.0.0
%description langpack-nl
Provides additional dutch translations and resources for %{name}.
@@ -978,9 +979,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-nn, hyphen-nn, mythes-nn
-Obsoletes: openoffice.org-langpack-nn
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-nn_NO
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-nn < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-nn_NO < 1:3.0.0
%description langpack-nn_NO
Provides additional nynorsk translations and resources for %{name}.
@@ -1000,9 +1001,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-pl, hyphen-pl, mythes-pl
-Obsoletes: openoffice.org-langpack-pl
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-pl_PL
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-pl < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-pl_PL < 1:3.0.0
%description langpack-pl_PL
Provides additional polish translations and resources for %{name}.
@@ -1012,9 +1013,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-pt
-Obsoletes: openoffice.org-langpack-pt
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-pt_PT
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-pt < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-pt_PT < 1:3.0.0
%description langpack-pt_PT
Provides additional portuguese translations and resources for %{name}.
@@ -1024,9 +1025,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-pt
-Obsoletes: openoffice.org-langpack-pt-BR
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-pt_BR
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-pt-BR < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-pt_BR < 1:3.0.0
%description langpack-pt_BR
Provides additional brazilian portuguese translations and resources for
@@ -1037,8 +1038,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ru, hyphen-ru
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ru
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-ru < 1:3.0.0
%description langpack-ru
Provides additional russian translations and resources for %{name}.
@@ -1048,9 +1049,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-sk, mythes-sk
-Obsoletes: openoffice.org-langpack-sk
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-sk_SK
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-sk < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-sk_SK < 1:3.0.0
%description langpack-sk_SK
Provides additional slovak translations and resources for %{name}.
@@ -1060,9 +1061,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-sl, hyphen-sl
-Obsoletes: openoffice.org-langpack-sl
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-sl_SI
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-sl < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-sl_SI < 1:3.0.0
%description langpack-sl_SI
Provides additional slovenian translations and resources for %{name}.
@@ -1072,8 +1073,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-sr
-Obsoletes: openoffice.org2-langpack-sr_CS
-Obsoletes: openoffice.org-langpack-sr_CS
+Obsoletes: openoffice.org-langpack-sr_CS < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-sr_CS < 1:3.0.0
%description langpack-sr
Provides additional serbian translations and resources for %{name}.
@@ -1102,8 +1103,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-sv, hyphen-sv
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-sv
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-sv < 1:3.0.0
%description langpack-sv
Provides additional swedish translations and resources for %{name}.
@@ -1114,8 +1115,8 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ta
Requires: lohit-fonts-tamil
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-ta_IN
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org2-langpack-ta_IN < 1:3.0.0
%description langpack-ta_IN
Provides additional tamil translations and resources for %{name}.
@@ -1126,9 +1127,9 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-th
Requires: thaifonts-scalable
-Obsoletes: openoffice.org-langpack-th
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-th_TH
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-th < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-th_TH < 1:3.0.0
%description langpack-th_TH
Provides additional thai translations and resources for %{name}.
@@ -1138,7 +1139,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-nso
-Obsoletes: openoffice.org2-langpack-nso_ZA
+Obsoletes: openoffice.org2-langpack-nso_ZA < 1:3.0.0
%description langpack-nso_ZA
Provides additional Northern Sotho translations and resources for
@@ -1149,8 +1150,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-tn
-Obsoletes: openoffice.org2-langpack-tn_ZA
-Obsoletes: openoffice.org-langpack-tn
+Obsoletes: openoffice.org-langpack-tn < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-tn_ZA < 1:3.0.0
%description langpack-tn_ZA
Provides additional tswana translations and resources for %{name}.
@@ -1160,8 +1161,8 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ts
-Obsoletes: openoffice.org2-langpack-ts_ZA
-Obsoletes: openoffice.org-langpack-ts
+Obsoletes: openoffice.org-langpack-ts < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-ts_ZA < 1:3.0.0
%description langpack-ts_ZA
Provides additional tsonga translations and resources for %{name}.
@@ -1170,9 +1171,9 @@
Summary: Turkish language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice.org-langpack-tr
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-tr
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-tr < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-tr < 1:3.0.0
%description langpack-tr_TR
Provides additional turkish translations and resources for %{name}.
@@ -1200,9 +1201,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: cjkunifonts-uming
-Obsoletes: openoffice.org-langpack-zh-CN
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-zh_CN
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-zh-CN < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-zh_CN < 1:3.0.0
%description langpack-zh_CN
Provides additional simplified chinese translations and resources for
@@ -1213,9 +1214,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: cjkunifonts-uming
-Obsoletes: openoffice.org-langpack-zh-TW
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-zh_TW
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-zh-TW < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-zh_TW < 1:3.0.0
%description langpack-zh_TW
Provides additional traditional chinese translations and resources for
@@ -1226,9 +1227,9 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-zu, hyphen-zu
-Obsoletes: openoffice.org-langpack-zu
-Obsoletes: openoffice.org-i18n
-Obsoletes: openoffice.org2-langpack-zu_ZA
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-langpack-zu < 1:2.0.3
+Obsoletes: openoffice.org2-langpack-zu_ZA < 1:3.0.0
%description langpack-zu_ZA
Provides additional zulu translations and resources for %{name}.
@@ -1238,7 +1239,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: lohit-fonts-bengali
-Obsoletes: openoffice.org2-langpack-as_IN
+Obsoletes: openoffice.org2-langpack-as_IN < 1:3.0.0
%description langpack-as_IN
Provides additional assamese translations and resources for %{name}.
@@ -1249,7 +1250,7 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-mr
Requires: lohit-fonts-marathi
-Obsoletes: openoffice.org2-langpack-mr_IN
+Obsoletes: openoffice.org2-langpack-mr_IN < 1:3.0.0
%description langpack-mr_IN
Provides additional marathi translations and resources for %{name}.
@@ -1260,7 +1261,7 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-ml
Requires: smc-fonts-meera
-Obsoletes: openoffice.org2-langpack-ml_IN
+Obsoletes: openoffice.org2-langpack-ml_IN < 1:3.0.0
%description langpack-ml_IN
Provides additional malayalam translations and resources for %{name}.
@@ -1271,7 +1272,7 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-or
Requires: lohit-fonts-oriya
-Obsoletes: openoffice.org2-langpack-or_IN
+Obsoletes: openoffice.org2-langpack-or_IN < 1:3.0.0
%description langpack-or_IN
Provides additional oriya translations and resources for %{name}.
@@ -1282,7 +1283,7 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-te
Requires: lohit-fonts-telugu
-Obsoletes: openoffice.org2-langpack-te_IN
+Obsoletes: openoffice.org2-langpack-te_IN < 1:3.0.0
%description langpack-te_IN
Provides additional telugu translations and resources for %{name}.
@@ -1293,7 +1294,7 @@
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: paktype-fonts
Requires: hunspell-ur
-Obsoletes: openoffice.org2-langpack-ur
+Obsoletes: openoffice.org2-langpack-ur < 1:3.0.0
%description langpack-ur
Provides additional urdu translations and resources for %{name}.
@@ -1303,7 +1304,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: lohit-fonts-kannada
-Obsoletes: openoffice.org2-langpack-kn_IN
+Obsoletes: openoffice.org2-langpack-kn_IN < 1:3.0.0
%description langpack-kn_IN
Provides additional kannada translations and resources for %{name}.
@@ -1399,7 +1400,8 @@
%patch57 -p1 -b .workspace.swffixes02.patch
%patch58 -p1
%patch59 -p1 -b .ooo97064.fpicker.honour-uilang-override.patch
-%patch60 -p1 -b .workspace.transogl03.patch
+%patch60 -p0 -b .workspace.transogl03.patch
+%patch61 -p1 -b .workspace.vcl97.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1889,8 +1891,10 @@
#set standard permissions for rpmlint
find $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{basisinstdir} $RPM_BUILD_ROOT/%{oooinstdir} -exec chmod +w {} \;
+find $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{basisinstdir} $RPM_BUILD_ROOT/%{oooinstdir} -type d -exec chmod 0755 {} \;
%if %{langpacks}
find $RPM_BUILD_ROOT/%{brinstdir} -exec chmod +w {} \;
+find $RPM_BUILD_ROOT/%{brinstdir} -type d -exec chmod 0755 {} \;
%endif
# move python bits into site-packages
@@ -3794,13 +3798,16 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Wed Dec 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
+* Thu Dec 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
- Resolves: rhbz#466680 package OGLTrans 3D OpenGL slide transitions
as an optional extension.
- Resolves: rhbz#474961 wrong impress accelerators
openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
- Resolves: rhbz#475154 UI Language override doesn't affect system dialogs
openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
+- version the Obsoletes
+- Resolves: rhbz#475795 same fallbacks for printing as screen
+ workspace.vcl97.patch
* Tue Dec 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.1
- rhbz#474719 add libXinerama-devel BuildRequires
workspace.transogl03.patch:
Index: workspace.transogl03.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.transogl03.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.transogl03.patch 10 Dec 2008 14:13:16 -0000 1.1
+++ workspace.transogl03.patch 11 Dec 2008 09:50:42 -0000 1.2
@@ -364,7 +364,7 @@
+++ config_office/configure.in (.../cws/transogl03) (revision 265193)
@@ -203,11 +203,6 @@
AC_ARG_WITH(system-cairo,
- [ --with-system-cairo Use Cairo libraries already on system
+ [ --with-system-cairo Use cairo libraries already on system
],,)
-AC_ARG_ENABLE(opengl,
-[ --enable-opengl Determines whether to use OpenGL (for 3D transitions)
@@ -374,7 +374,7 @@
AC_ARG_ENABLE(dbus,
[ --enable-dbus Determines whether to enable presentation mode
screensaver control under GNOME via DBUS
-@@ -376,6 +371,9 @@
+@@ -373,6 +368,9 @@
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
[ BSH_JAR="$withval"
])
@@ -384,17 +384,17 @@
AC_ARG_ENABLE(minimizer,
[ --enable-minimizer enables the build of the Presentation Minimizer extension
],,)
-@@ -408,9 +406,6 @@
+@@ -405,9 +403,6 @@
[ --servlet-api-jar=JARFILE Specify path to jarfile manually ],
[ SERVLETAPI_JAR="$withval"
])
-AC_ARG_ENABLE(ogltrans,
-[ --enable-ogltrans enables the build of the OGLTrans extension
-],,)
- AC_ARG_ENABLE(reportdesign,
- [ --disable-reportdesign disables the build of the Report Builder extension
+ AC_ARG_ENABLE(report-builder,
+ [ --enable-report-builder enables the build of the Report Builder extension
],,)
-@@ -5299,9 +5294,9 @@
+@@ -5376,9 +5371,9 @@
dnl ===================================================================
AC_MSG_CHECKING([whether to build the OGLTrans extension])
@@ -406,7 +406,7 @@
AC_MSG_RESULT([yes])
AC_CHECK_HEADER(GL/gl.h, [],
[AC_MSG_ERROR([OpenGL headers not found])], [])
-@@ -5309,12 +5304,12 @@
+@@ -5386,12 +5381,12 @@
[AC_MSG_ERROR(libGL not installed or functional)], [])
AC_CHECK_LIB(GLU, main, [],
[AC_MSG_ERROR(libGLU not installed or functional)], [])
@@ -4636,8 +4636,8 @@
@@ -6,6 +6,7 @@
dx sdext\source\minimizer\registry\data\org\openoffice\Office\UI nmake - all sdext_minimizer_rdooou NULL
dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL
- dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL
-+dx sdext\source\ogltrans nmake - u sdext_ogltrans sdext_inc NULL
+ dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL
++dx sdext\source\ogltrans nmake - u sdext_ogltrans sdext_inc NULL
dx sdext\inc nmake - all sdext_inc NULL
dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL
dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL
More information about the fedora-extras-commits
mailing list