rpms/openoffice.org/devel .cvsignore, 1.160, 1.161 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.18, 1.19 openoffice.org.spec, 1.1485, 1.1486 sources, 1.285, 1.286 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch, 1.2, NONE openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch, 1.1, NONE openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch, 1.1, NONE openoffice.org-2.3.0.ooo82966.svx.missing3d.patch, 1.1, NONE openoffice.org-2.4.0.gccXXXXX.wizards.patch, 1.1, NONE openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Apr 23 08:47:45 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23575
Modified Files:
.cvsignore
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org.spec sources
Removed Files:
openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
openoffice.org-2.4.0.gccXXXXX.wizards.patch
openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
Log Message:
Resolves: rhbz#443735 weird ass rendering for Sazanami fonts
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- .cvsignore 18 Apr 2008 07:36:58 -0000 1.160
+++ .cvsignore 23 Apr 2008 08:47:09 -0000 1.161
@@ -5,3 +5,4 @@
unowinreg.dll
bengali.sdf
DEV300_m9.tar.bz2
+DEV300_m10.tar.bz2
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 8 Jan 2008 14:51:50 -0000 1.18
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 23 Apr 2008 08:47:09 -0000 1.19
@@ -578,15 +578,24 @@
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2006-05-08 16:03:34.000000000 -0400
-@@ -106,6 +106,7 @@
- FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*);
+@@ -136,6 +136,7 @@
+ FcBool (*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
+ FcBool (*m_pFcPatternAddDouble)(FcPattern*,const char*,double);
FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
-@@ -194,6 +195,8 @@
+@@ -183,7 +184,7 @@
+
+ void FcPatternDestroy( FcPattern* pPattern )
+ { m_pFcPatternDestroy( pPattern ); }
+-
++
+ FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
+ { return m_pFcFontList( pConfig, pPattern, pSet ); }
+
+@@ -240,6 +241,8 @@
{ return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
{ return m_pFcPatternAddInteger( pPattern, pObject, nValue ); }
@@ -595,7 +604,18 @@
FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
{ return m_pFcPatternAddString( pPattern, pObject, pString ); }
FcBool FcPatternAddBool( FcPattern* pPattern, const char* pObject, bool nValue )
-@@ -279,6 +282,8 @@
+@@ -251,7 +254,9 @@
+ { return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; }
+
+ public: // TODO: cleanup
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontconfigNameToLocalized;
++ FcResult FamilyFromPattern(FcPattern* pPattern, FcChar8 **family);
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized;
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical;
+ };
+
+ oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol )
+@@ -341,6 +346,8 @@
loadSymbol( "FcConfigSubstitute" );
m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
loadSymbol( "FcPatternAddInteger" );
@@ -604,7 +624,7 @@
m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool))
loadSymbol( "FcPatternAddBool" );
m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *))
-@@ -308,6 +313,7 @@
+@@ -378,6 +385,7 @@
m_pFcDefaultSubstitute &&
m_pFcConfigSubstitute &&
m_pFcPatternAddInteger &&
@@ -612,7 +632,99 @@
m_pFcPatternAddCharSet &&
m_pFcPatternAddBool &&
m_pFcPatternAddString
-@@ -410,7 +416,7 @@
+@@ -512,54 +520,53 @@
+
+ return candidate;
+ }
++}
+
+-
+- FcResult lcl_FamilyFromPattern(FontCfgWrapper& rWrapper, FcPattern* pPattern, FcChar8 **family,
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > &aFontconfigNameToLocalized)
++FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family)
++{
++ FcChar8 *origfamily;
++ FcResult eFamilyRes = FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
++ *family = origfamily;
++
++ if( eFamilyRes == FcResultMatch)
+ {
+- FcChar8 *origfamily;
+- FcResult eFamilyRes = rWrapper.FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
+- *family = origfamily;
+-
+- if( eFamilyRes == FcResultMatch)
++ FcChar8* familylang = NULL;
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
+ {
+- FcChar8* familylang = NULL;
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
++ std::vector< lang_and_family > lang_and_families;
++ lang_and_families.push_back(lang_and_family(familylang, *family));
++ int k = 1;
++ while (1)
+ {
+- std::vector< lang_and_family > lang_and_families;
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
++ break;
++ if (FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
++ break;
+ lang_and_families.push_back(lang_and_family(familylang, *family));
+- int k = 1;
+- while (1)
+- {
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
+- break;
+- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
+- break;
+- lang_and_families.push_back(lang_and_family(familylang, *family));
+- ++k;
+- }
+-
+- //possible to-do, sort by UILocale instead of process locale
+- rtl_Locale* pLoc;
+- osl_getProcessLocale(&pLoc);
+- localizedsorter aSorter(pLoc);
+- *family = aSorter.bestname(lang_and_families);
+-
+- std::vector<lang_and_family>::const_iterator aEnd = lang_and_families.end();
+- for (std::vector<lang_and_family>::const_iterator aIter = lang_and_families.begin(); aIter != aEnd; ++aIter)
+- {
+- const char *candidate = (const char*)(aIter->second);
+- if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
+- aFontconfigNameToLocalized[OString(candidate)] = OString((const char*)(*family));
+- }
++ ++k;
++ }
++
++ //possible to-do, sort by UILocale instead of process locale
++ rtl_Locale* pLoc;
++ osl_getProcessLocale(&pLoc);
++ localizedsorter aSorter(pLoc);
++ *family = aSorter.bestname(lang_and_families);
++
++ std::vector<lang_and_family>::const_iterator aEnd = lang_and_families.end();
++ for (std::vector<lang_and_family>::const_iterator aIter = lang_and_families.begin(); aIter != aEnd; ++aIter)
++ {
++ const char *candidate = (const char*)(aIter->second);
++ if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
++ m_aFontNameToLocalized[OString(candidate)] = OString((const char*)(*family));
+ }
++ if (rtl_str_compare((const char*)origfamily, (const char*)(*family)) != 0)
++ m_aLocalizedToCanonical[OString((const char*)(*family))] = OString((const char*)origfamily);
+ }
+-
+- return eFamilyRes;
+ }
++
++ return eFamilyRes;
+ }
+
+-
+ /*
+ * PrintFontManager::initFontconfig
+ */
+@@ -594,18 +601,16 @@
int weight = 0;
int spacing = 0;
int nCollectionEntry = -1;
@@ -620,8 +732,11 @@
+ FcBool outline = false;
FcResult eFileRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
- FcResult eFamilyRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
-@@ -420,8 +426,6 @@
+- FcResult eFamilyRes = lcl_FamilyFromPattern(rWrapper, pFSet->fonts[i], &family, rWrapper.m_aFontconfigNameToLocalized );
++ FcResult eFamilyRes = rWrapper.FamilyFromPattern( pFSet->fonts[i], &family );
+ FcResult eStyleRes = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_STYLE, 0, &style );
+ FcResult eSlantRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SLANT, 0, &slant );
+ FcResult eWeightRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_WEIGHT, 0, &weight );
FcResult eSpacRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
FcResult eOutRes = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
@@ -630,7 +745,7 @@
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
continue;
-@@ -559,15 +563,6 @@
+@@ -745,15 +750,6 @@
{
pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
}
@@ -646,23 +761,21 @@
// update font cache
m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -751,6 +746,78 @@
+@@ -957,8 +953,8 @@
+ if( eFileRes == FcResultMatch )
+ {
+ OString sFamily((sal_Char*)family);
+- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontconfigNameToLocalized.find(sFamily);
+- if (aI != rWrapper.m_aFontconfigNameToLocalized.end())
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily);
++ if (aI != rWrapper.m_aFontNameToLocalized.end())
+ sFamily = aI->second;
+ aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
+ }
+@@ -989,6 +985,106 @@
return aName;
}
-+#ifdef ENABLE_FONTCONFIG
-+static void lcl_InfoToPattern( const FastPrintFontInfo& rInfo, FontCfgWrapper& rWrapper, FcPattern* pPattern )
-+{
-+ OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
-+ if( aFamily.getLength() )
-+ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
-+
-+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-+
-+}
-+#endif
-+
-+
+FontConfigHints PrintFontManager::getFontConfigHints( const FastPrintFontInfo& rInfo, int nSize)
+{
+ FontConfigHints aHints;
@@ -674,18 +787,32 @@
+ FcConfig* pConfig = rWrapper.getDefConfig();
+ FcPattern* pPattern = rWrapper.FcPatternCreate();
+
-+ lcl_InfoToPattern( rInfo, rWrapper, pPattern );
++ OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
++ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
++ if (aI != rWrapper.m_aLocalizedToCanonical.end())
++ sFamily = aI->second;
++ if( sFamily.getLength() )
++ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr() );
++
++ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
++
+ rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
+
++ OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
+ FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
-+ int hintstyle = FC_HINT_FULL;
++ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
+
+ rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
++
+ rWrapper.FcDefaultSubstitute( pPattern );
+ FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
+ FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
+ FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
++ FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
+ FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
++
+ FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
+ rWrapper.FcPatternDestroy(pPattern);
+
@@ -718,26 +845,54 @@
+ break;
+ }
+ }
++ if (eSubPixel != FcResultMatch)
++ aHints.m_eSubPixel = fcsubpixel::Unknown;
++ else
++ {
++ switch (rgba)
++ {
++ default:
++ case FC_RGBA_UNKNOWN:
++ aHints.m_eSubPixel = fcsubpixel::Unknown;
++ break;
++ case FC_RGBA_RGB:
++ aHints.m_eSubPixel = fcsubpixel::RGB;
++ break;
++ case FC_RGBA_BGR:
++ aHints.m_eSubPixel = fcsubpixel::BGR;
++ break;
++ case FC_RGBA_VRGB:
++ aHints.m_eSubPixel = fcsubpixel::VRGB;
++ break;
++ case FC_RGBA_VBGR:
++ aHints.m_eSubPixel = fcsubpixel::VBGR;
++ break;
++ case FC_RGBA_NONE:
++ aHints.m_eSubPixel = fcsubpixel::NONE;
++ break;
++ }
++ }
+#endif
+ return aHints;
+}
+
bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale )
{
- #ifdef ENABLE_FONTCONFIG
-@@ -777,11 +843,7 @@
+ FontCfgWrapper& rWrapper = FontCfgWrapper::get();
+@@ -1014,9 +1110,10 @@
if( aLangAttrib.getLength() )
rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() );
- OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
- if( aFamily.getLength() )
- rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
--
-- addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
-+ lcl_InfoToPattern( rInfo, rWrapper, pPattern );
++ OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
++
++ if( sFamily.getLength() )
++ rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr() );
+
+ addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
- rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
- rWrapper.FcDefaultSubstitute( pPattern );
diff -ru psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:32.000000000 -0400
@@ -1078,109 +1233,6 @@
{}
};
-diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2006-05-23 12:23:55.000000000 +0100
-@@ -36,6 +36,8 @@
- #ifdef ENABLE_FONTCONFIG
- #include <fontconfig/fontconfig.h>
- // be compatible with fontconfig 2.2.0 release
-+#include <cairo-ft.h>
-+#include <gdk/gdkscreen.h>
- #ifndef FC_WEIGHT_BOOK
- #define FC_WEIGHT_BOOK 75
- #endif
-@@ -151,7 +153,7 @@
-
- void FcPatternDestroy( FcPattern* pPattern )
- { m_pFcPatternDestroy( pPattern ); }
--
-+
- FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
- { return m_pFcFontList( pConfig, pPattern, pSet ); }
-
-@@ -774,14 +777,19 @@
- rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
-
- FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
-- int hintstyle = FC_HINT_FULL;
-+ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
-
- rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
-+ GdkScreen *pScreen = gdk_screen_get_default();
-+ if (const cairo_font_options_t *pOptions = pScreen ? gdk_screen_get_font_options(pScreen) : 0)
-+ cairo_ft_font_options_substitute(pOptions, pPattern);
- rWrapper.FcDefaultSubstitute( pPattern );
- FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
- FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
- FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
-+ FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
- FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
-+
- FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
-
- if( eEmbeddedBitmap == FcResultMatch )
-@@ -813,6 +820,33 @@
- break;
- }
- }
-+ if (eSubPixel != FcResultMatch)
-+ aHints.m_eSubPixel = fcsubpixel::Unknown;
-+ else
-+ {
-+ switch (rgba)
-+ {
-+ default:
-+ case FC_RGBA_UNKNOWN:
-+ aHints.m_eSubPixel = fcsubpixel::Unknown;
-+ break;
-+ case FC_RGBA_RGB:
-+ aHints.m_eSubPixel = fcsubpixel::RGB;
-+ break;
-+ case FC_RGBA_BGR:
-+ aHints.m_eSubPixel = fcsubpixel::BGR;
-+ break;
-+ case FC_RGBA_VRGB:
-+ aHints.m_eSubPixel = fcsubpixel::VRGB;
-+ break;
-+ case FC_RGBA_VBGR:
-+ aHints.m_eSubPixel = fcsubpixel::VBGR;
-+ break;
-+ case FC_RGBA_NONE:
-+ aHints.m_eSubPixel = fcsubpixel::NONE;
-+ break;
-+ }
-+ }
- #endif
- return aHints;
- }
-diff -ru psprint/source/fontmanager/makefile.mk psprint/source/fontmanager/makefile.mk
---- openoffice.org.orig/psprint/source/fontmanager/makefile.mk 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/makefile.mk 2006-05-23 09:59:14.000000000 +0100
-@@ -49,6 +49,9 @@
- CDEFS += -DENABLE_FONTCONFIG
- .ENDIF
-
-+PKGCONFIG_MODULES=gdk-2.0 freetype2
-+.INCLUDE: pkg_config.mk
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES=\
-diff -ru psprint/util/makefile.mk psprint/util/makefile.mk
---- openoffice.org.orig/psprint/util/makefile.mk 2006-05-22 13:59:49.000000000 +0100
-+++ openoffice.org/psprint/util/makefile.mk 2006-05-23 10:00:18.000000000 +0100
-@@ -90,5 +90,10 @@
-
- # --- Targets ------------------------------------------------------------
-
-+PKGCONFIG_MODULES=gdk-2.0 freetype2
-+.INCLUDE: pkg_config.mk
-+SHL1STDLIBS+=$(PKGCONFIG_LIBS)
-+
-+
-
- .INCLUDE : target.mk
Index: svppspgraphics.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.cxx,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1485
retrieving revision 1.1486
diff -u -r1.1485 -r1.1486
--- openoffice.org.spec 17 Apr 2008 18:40:38 -0000 1.1485
+++ openoffice.org.spec 23 Apr 2008 08:47:09 -0000 1.1486
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 8
+%define ooomilestone 10
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -101,58 +101,52 @@
Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
Patch29: workspace.tl37.patch
Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch31: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch32: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch33: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch34: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch35: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch36: openoffice.org-2.2.0.rh232389.tango.patch
-Patch37: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch38: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch39: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch40: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch41: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch42: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch43: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch45: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch46: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch47: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch48: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch49: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch50: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch51: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch52: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch53: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch54: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch55: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch56: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch57: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch58: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch59: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch60: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch61: workspace.cmcfixes43.patch
-Patch62: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch63: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch64: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch65: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch66: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch67: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch68: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch69: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch70: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch71: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-Patch72: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch73: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
-Patch74: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch75: openoffice.org-2.4.0.gccXXXXX.wizards.patch
+Patch31: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch32: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch33: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch34: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch35: openoffice.org-2.2.0.rh232389.tango.patch
+Patch36: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch37: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch38: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch39: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch40: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch41: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch42: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch43: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch44: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch45: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch46: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch47: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch48: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch49: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch50: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch51: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch52: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch53: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch54: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch55: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch56: workspace.cmcfixes43.patch
+Patch57: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch58: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch59: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch60: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch61: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch62: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch63: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch64: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch65: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch66: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+Patch67: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch68: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+Patch69: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
%define ureinstdir %{baseinstdir}/ure
%define basisinstdir %{baseinstdir}/basis3.0
-%define oooinstdir %{instdir}/openoffice.org3.0
-%define brinstdir %{instdir}/broffice.org3.0
+%define oooinstdir %{instdir}/openoffice.org3
+%define brinstdir %{instdir}/broffice.org3
%define OFFICEUPD 300
%define UPD %nil
%define SOPOST l*
@@ -1216,51 +1210,45 @@
%patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
%patch29 -p1 -b .tl37.patch
%patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch31 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch32 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch33 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch34 -p0 -b .ooo68717.gstreamer.video.patch
-%patch35 -p1 -b .ooo63159.sal.dtype.patch
-%patch36 -p1 -b .rh232389.tango.patch
-%patch37 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch38 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch39 -p1 -b .ooo80816.selinux.bridges.patch
-%patch40 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch41 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch42 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch43 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH44}
-%patch45 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch46 -p1 -b .ooo76649.httpencoding.patc
-%patch47 -p1 -b .ooo82966.svx.missing3d.patch
-%patch48 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch49 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch50 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch51 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch52 -p1 -b .ooo85097.desktop.pagein.patch
-%patch53 -p1
-%patch54 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch55 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch56 -p1 -b .ooo85448.emptyrpath.patch
-%patch57 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch58 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch59 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch60 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch61 -p1 -b .workspace.cmcfixes43.patch
-%patch62 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch63 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch64 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch65 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch66 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch67 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch68 -p1 -b .ooo87991.fpickersafe.patch
-%patch69 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch70 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch71 -p1 -b .oo88319.setup_native.missing.patch
-%patch72 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch73 -p1 -b .ooo88375.filter.disablepdf.patch
-%patch74 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch75 -p1 -b .gccXXXXX.wizards.patch
+%patch31 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch32 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch33 -p0 -b .ooo68717.gstreamer.video.patch
+%patch34 -p1 -b .ooo63159.sal.dtype.patch
+%patch35 -p1 -b .rh232389.tango.patch
+%patch36 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch37 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch38 -p1 -b .ooo80816.selinux.bridges.patch
+%patch39 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch40 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH41}
+%patch42 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch43 -p1 -b .ooo76649.httpencoding.patc
+%patch44 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch45 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch46 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch47 -p1 -b .ooo85097.desktop.pagein.patch
+%patch48 -p1
+%patch49 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch50 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch51 -p1 -b .ooo85448.emptyrpath.patch
+%patch52 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch53 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch54 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch55 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch56 -p1 -b .workspace.cmcfixes43.patch
+%patch57 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch58 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch59 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch60 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch61 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch62 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch63 -p1 -b .ooo87991.fpickersafe.patch
+%patch64 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch65 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch66 -p1 -b .oo88319.setup_native.missing.patch
+%patch67 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch68 -p1 -b .ooo88375.filter.disablepdf.patch
+%patch69 -p1 -b .ooo6087.sc.sheetnames.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1378,8 +1366,8 @@
echo - ---dump log end---
dmake broffice_pt-BR
fi
-rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/ure
-rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/basis3.0
+rm -rf $RPM_BUILD_ROOT/%{ureinstdir}
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}
%endif
if ! dmake openoffice_en-US; then
echo - ---dump log start---
@@ -1437,6 +1425,7 @@
#configure sdk
pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk
+ find . -name "*.orig" -exec rm {} \;
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," \
@@ -1797,13 +1786,9 @@
rm -rf icons/gnome applications mime application-registry
# rhbz#156067 don't version the icons
find . -name "*.desktop" -exec sed -i -e s/$ICONPRODUCTVERSION//g {} \;
-find . -name "openofficeorg$ICONPRODUCTVERSION*" -exec bash -c \
+find . -name "*officeorg$ICONPRODUCTVERSION*" -exec bash -c \
"mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
-find . -name "openoffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
- "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
-find . -name "brofficeorg$ICONPRODUCTVERSION*" -exec bash -c \
- "mv \$1 \`echo \$1 | sed s/brofficeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
-find . -name "broffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
+find . -name "*office.org$LONGICONPRODUCTVERSION*" -exec bash -c \
"mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
find . -type l -print -exec ls -lag '{}' \; | gawk '{q="'\''" ; file=$0 ; \
getline; \
@@ -1954,6 +1939,7 @@
%dir %{baseinstdir}/share/uno_packages
%{baseinstdir}/share/uno_packages/cache
%dir %{baseinstdir}/extensions
+%dir %{basisinstdir}
%dir %{basisinstdir}/help
%dir %{basisinstdir}/help/en
%{basisinstdir}/help/en/default.css
@@ -2467,12 +2453,12 @@
#gnome integration
%{basisinstdir}/program/gnome-set-default-application
#icons and mime
-%{_datadir}/icons/*
-%{_datadir}/mime-info/*
+%{_datadir}/icons/*/*/*/gnome*
+%{_datadir}/icons/*/*/*/openoffice*
+%{_datadir}/mime-info/openoffice.org.*
%{basisinstdir}/program/libxmlsecurity.so
%{basisinstdir}/program/liboldxmlsec*
%{_datadir}/mime/packages/openoffice.org.xml
-%{_datadir}/mimelnk/application/*extension*
%{basisinstdir}/program/behelper.uno.so
%{basisinstdir}/program/configmgr2.uno.so
%{basisinstdir}/program/desktopbe1.uno.so
@@ -2517,6 +2503,9 @@
%{basisinstdir}/program/oovbaapi.rdb
#share unopkg
%dir %{oooinstdir}
+%{oooinstdir}/basis-link
+%dir %{oooinstdir}/share
+%{oooinstdir}/share/uno_packages
%dir %{oooinstdir}/program
%{oooinstdir}/program/unopkg
%{oooinstdir}/program/unopkg.bin
@@ -2594,11 +2583,10 @@
%{oooinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
%{oooinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
%{oooinstdir}/share/registry/data/org/openoffice/Setup.xcu
-%{oooinstdir}/share/uno_packages
%{oooinstdir}/share/xdg/
%{oooinstdir}/program/redirectrc
-%{oooinstdir}/basis-link
%{_datadir}/applications/openoffice.org-extensionmgr.desktop
+%{_datadir}/mimelnk/application/openoffice.org-extension.desktop
#launchers
%{_bindir}/openoffice.org-1.9
%{_bindir}/openoffice.org-2.0
@@ -2660,14 +2648,40 @@
%{brinstdir}/program/redirectrc
%{brinstdir}/basis-link
%{_datadir}/applications/broffice.org-extensionmgr.desktop
+%{_datadir}/mimelnk/application/broffice.org-extension.desktop
+%{_datadir}/mime-info/broffice.org.*
+%{_datadir}/icons/*/*/*/broffice*
#launchers
%{_bindir}/broffice.org
%post -n broffice.org-brand
update-desktop-database -q %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null
+for theme in hicolor locolor; do
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ if test -d "%{_datadir}/icons/$theme"; then
+ if test -f "%{_datadir}/icons/$theme/index.theme"; then
+ touch --no-create %{_datadir}/icons/$theme
+ gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ fi
+ fi
+ fi
+done
%postun -n broffice.org-brand
update-desktop-database -q %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null
+for theme in hicolor locolor; do
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ if test -d "%{_datadir}/icons/$theme"; then
+ if test -f "%{_datadir}/icons/$theme/index.theme"; then
+ touch --no-create %{_datadir}/icons/$theme
+ gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ fi
+ fi
+ fi
+done
+
%files base-core
%defattr(-,root,root,-)
@@ -3292,7 +3306,17 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Thu Apr 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.8.1
+* Tue Apr 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
+- next version
+- drop integrated openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+- drop integrated openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+- drop openoffice.org-2.4.0.gccXXXXX.wizards.patch
+- drop openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+- drop openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+- drop openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+
+* Mon Apr 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.9.1
+- Resolves: rhbz#358021 enable BrOffice.org brand
- add openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
- add openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
- add openoffice.org-2.4.0.gccXXXXX.wizards.patch to try and build
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- sources 18 Apr 2008 07:36:58 -0000 1.285
+++ sources 23 Apr 2008 08:47:09 -0000 1.286
@@ -4,4 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-9dcae93cf0e348402f283fdb56d42fe2 DEV300_m9.tar.bz2
+ee08824f8ddadab72b6793bd90ef14ed DEV300_m10.tar.bz2
--- openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch DELETED ---
--- openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch DELETED ---
--- openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch DELETED ---
--- openoffice.org-2.3.0.ooo82966.svx.missing3d.patch DELETED ---
--- openoffice.org-2.4.0.gccXXXXX.wizards.patch DELETED ---
--- openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch DELETED ---
More information about the fedora-extras-commits
mailing list